diff options
| author | John Högberg <[email protected]> | 2018-07-24 08:51:26 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-07-24 08:51:26 +0200 |
| commit | a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0 (patch) | |
| tree | 53699383cb0e25d246a44f21e76ba60c8332e213 /lib/ssl/doc | |
| parent | c814c388d5c45c8d70426389e702426424086eca (diff) | |
| parent | 958ad184c843ce32497eef319f10db7a3a3759c2 (diff) | |
| download | otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.gz otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.bz2 otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.zip | |
Merge branch 'maint'
* maint:
Fix typo in xmerl_scan:string/1
Updated OTP version
Prepare release
ssl: Engine key trumps certfile option
inets: Prepare for release
inets: Improve error handling
Diffstat (limited to 'lib/ssl/doc')
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 917df03b5b..62ec9d0190 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -170,6 +170,35 @@ </section> +<section><title>SSL 8.2.6.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Improve cipher suite handling correcting ECC and TLS-1.2 + requierments. Backport of solution for ERL-641</p> + <p> + Own Id: OTP-15178</p> + </item> + </list> + </section> + + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Option keyfile defaults to certfile and should be trumped + with key. This failed for engine keys.</p> + <p> + Own Id: OTP-15193</p> + </item> + </list> + </section> + +</section> + <section><title>SSL 8.2.6</title> <section><title>Fixed Bugs and Malfunctions</title> |