aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-05-12 10:39:07 +0200
committerHans Nilsson <[email protected]>2017-05-12 10:39:07 +0200
commit773c4d4f0416f25e3c0c6939f8d0871dc4486bab (patch)
tree942a4a892eee6faad4074b21f69aa852d59f8b23 /lib/ssl
parent9fcbf829e38f4e63bc238d56d4debe38fde7b051 (diff)
parent736de00985c1ed44760e52283eeb727d3f14bb1f (diff)
downloadotp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.tar.gz
otp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.tar.bz2
otp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.zip
Merge branch 'maint'
Conflicts: OTP_VERSION lib/inets/vsn.mk lib/ssl/vsn.mk
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/doc/src/notes.xml15
-rw-r--r--lib/ssl/src/ssl_connection.erl1
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index d8e26d635f..29ec3f9d57 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 be64081599..e935e07b65 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -842,7 +842,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).