aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
committerMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
commit5f89a574cb57f94c9d7d45370b5002b1d38147c9 (patch)
treefaa4a449754c8348a8ef06938f8ffe1246ed0b16 /lib/public_key
parent36d4d6fbe37ba9b03a157cdd0e66f3ac28921e0e (diff)
parent20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff)
downloadotp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.gz
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.bz2
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.zip
Merge tag 'OTP_R16B02'
The R16B02 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/doc/src/notes.xml23
-rw-r--r--lib/public_key/vsn.mk2
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index e18d350dc5..add324dae2 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -34,6 +34,29 @@
<file>notes.xml</file>
</header>
+<section><title>Public_Key 0.20</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Extend PKCS-7 to support SCEP (Simple Certificate
+ Enrollment Protocol).</p>
+ <p>
+ Own Id: OTP-10874</p>
+ </item>
+ <item>
+ <p>
+ public_key:pem_entry_decode/2 now handles AES-128-CBC
+ ciphered keys. Thanks to Simon Cornish.</p>
+ <p>
+ Own Id: OTP-11281</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Public_Key 0.19</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index b820f24d2a..72247f14d8 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.19
+PUBLIC_KEY_VSN = 0.20