diff options
| author | Hans Nilsson <[email protected]> | 2017-05-12 10:34:25 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-05-12 10:34:25 +0200 |
| commit | 736de00985c1ed44760e52283eeb727d3f14bb1f (patch) | |
| tree | 1f5fab5eb321c6979840707125d7eca9842c0635 /lib/ssl | |
| parent | 6e4cb1248e354760d137fff297655f96cfb291cb (diff) | |
| parent | f954cdea9b67369185094a3aea7cb611dd680b3c (diff) | |
| download | otp-736de00985c1ed44760e52283eeb727d3f14bb1f.tar.gz otp-736de00985c1ed44760e52283eeb727d3f14bb1f.tar.bz2 otp-736de00985c1ed44760e52283eeb727d3f14bb1f.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 15 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 1 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 7ffb9c0e88..d13ad09470 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -28,6 +28,21 @@ <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 8.1.3</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Remove debug printout</p> + <p> + Own Id: OTP-14396</p> + </item> + </list> + </section> + +</section> + <section><title>SSL 8.1.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index a5569460d6..ad220ae9de 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -858,7 +858,6 @@ handle_common_event(internal, #change_cipher_spec{type = <<1>>}, StateName, StateName, State); handle_common_event(_Type, Msg, StateName, #state{negotiated_version = Version} = State, _) -> - ct:pal("Unexpected msg ~p", [Msg]), Alert = ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), handle_own_alert(Alert, Version, {StateName, Msg}, State). diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 82184f5c74..7c2d9bec48 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 8.1.2 +SSL_VSN = 8.1.3 |