diff options
| author | Erlang/OTP <[email protected]> | 2018-11-09 17:51:30 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-11-09 17:51:30 +0100 |
| commit | 4c4eb4c40f33d9663cbce291e920f4c8921cc4aa (patch) | |
| tree | 784b042a449749e1669a47a9276600f6db270dbd | |
| parent | ef7d4b64ccb8228d65fefe66ed2db8dba4e71da4 (diff) | |
| download | otp-4c4eb4c40f33d9663cbce291e920f4c8921cc4aa.tar.gz otp-4c4eb4c40f33d9663cbce291e920f4c8921cc4aa.tar.bz2 otp-4c4eb4c40f33d9663cbce291e920f4c8921cc4aa.zip | |
Prepare release
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 15 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets | 3 |
3 files changed, 17 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 04fc3e1492..caa1110307 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,21 @@ </header> <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 8.2.6.4</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Add engine support for RSA key exchange</p> + <p> + Own Id: OTP-15420</p> + </item> + </list> + </section> + +</section> + <section><title>SSL 8.2.6.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 08fb667f83..1280efa77c 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 8.2.6.3 +SSL_VSN = 8.2.6.4 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index e5a5e16123..2cba13f734 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,2 +1 @@ -OTP-15371 -OTP-15412 +OTP-15420 |