aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2017-12-13 10:17:42 +0100
committerHenrik Nord <[email protected]>2017-12-13 10:17:42 +0100
commit7e0d632c9635cb2cd7f635291a9c331612400334 (patch)
tree40ca76b9201d1792a886f17a23302db479e38603 /lib/public_key
parent18a08499db5223dfc3c96b64220a4b3e6a79c799 (diff)
parent44b09e036b31b29dddc3b178e8f6b9fc96a9a874 (diff)
downloadotp-7e0d632c9635cb2cd7f635291a9c331612400334.tar.gz
otp-7e0d632c9635cb2cd7f635291a9c331612400334.tar.bz2
otp-7e0d632c9635cb2cd7f635291a9c331612400334.zip
Merge branch 'maint'
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/doc/src/notes.xml25
-rw-r--r--lib/public_key/vsn.mk2
2 files changed, 26 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index a4c0194328..11012ee9e5 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,31 @@
<file>notes.xml</file>
</header>
+<section><title>Public_Key 1.5.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed a bug in <c>public_key:ssh_encode/2</c> that made
+ it possible to erroneously encode e.g. an RSA key with
+ another type e.g. ECDSA in the resulting binary.</p>
+ <p>
+ Own Id: OTP-14570 Aux Id: ERIERL-52, OTP-14676 </p>
+ </item>
+ <item>
+ <p>
+ Corrected handling of parameterized EC keys in
+ public_key:generate_key/1 so that it will work as
+ expected instead of causing a runtime error in crypto.</p>
+ <p>
+ Own Id: OTP-14620</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Public_Key 1.5.1</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index c01d8820f2..99a0cc087e 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.5.1
+PUBLIC_KEY_VSN = 1.5.2