aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-05-13 09:40:16 +0200
committerHenrik Nord <[email protected]>2015-05-13 09:40:16 +0200
commit9a81b28598fadc44bf506354c9227e41aac786f6 (patch)
tree67b1db67c5050ce5cf37a182841ab34c6cbc5fe9 /lib/crypto
parent6a3e878126da1e8d75c704510c7a7339ff306138 (diff)
downloadotp-9a81b28598fadc44bf506354c9227e41aac786f6.tar.gz
otp-9a81b28598fadc44bf506354c9227e41aac786f6.tar.bz2
otp-9a81b28598fadc44bf506354c9227e41aac786f6.zip
Revert "Prepare release"
This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/doc/src/notes.xml43
-rw-r--r--lib/crypto/vsn.mk2
2 files changed, 1 insertions, 44 deletions
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 6ab109e349..a0ebc4b3dd 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -30,49 +30,6 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
-<section><title>Crypto 3.6</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- Enhance crypto:generate_key to calculate ECC public keys
- from private key.</p>
- <p>
- Own Id: OTP-12394</p>
- </item>
- <item>
- <p>
- Fix bug in <c>crypto:generate_key</c> for <c>ecdh</c>
- that could cause VM crash for faulty input.</p>
- <p>
- Own Id: OTP-12733</p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Use the EVP API for AES-CBC crypto to enables the use of
- hardware acceleration for AES-CBC crypto on newer Intel
- CPUs (AES-NI), among other platforms.</p>
- <p>
- Own Id: OTP-12380</p>
- </item>
- <item>
- <p>
- Add AES ECB block encryption.</p>
- <p>
- Own Id: OTP-12403</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Crypto 3.5</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 55b1b3e8c4..8489b59562 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 3.6
+CRYPTO_VSN = 3.5