From f3a74a7dfb633b21b7d06e48bf430071cdc0f779 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 8 Dec 2017 10:53:22 +0100
Subject: Update version numbers

---
 lib/public_key/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/public_key')

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
-- 
cgit v1.2.3


From 47198f179ab14cf8cfcdab0d976650cd1519b236 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 8 Dec 2017 10:57:50 +0100
Subject: Update release notes

---
 lib/public_key/doc/src/notes.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'lib/public_key')

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>
-- 
cgit v1.2.3