From 9b8ccd4884ce479988868d72644fbd9e85170025 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 19 Feb 2018 15:11:05 +0100 Subject: ssl: Backport PR-1709 --- lib/ssl/src/ssl_connection.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 0e51106bfb..2db9172d50 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -858,8 +858,8 @@ handle_common_event(internal, #change_cipher_spec{type = <<1>>}, StateName, StateName, State); handle_common_event(_Type, Msg, StateName, #state{negotiated_version = Version} = State, _) -> - Alert = ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), - handle_own_alert(Alert, Version, {StateName, Msg}, State). + Alert = ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE, {unexpected_msg, Msg}), + handle_own_alert(Alert, Version, StateName, State). handle_call({application_data, _Data}, _, _, _, _) -> %% In renegotiation priorities handshake, send data when handshake is finished -- cgit v1.2.3 From f4e5f4fa890591a06a28aa9e4459fb2d9f5201d4 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 19 Feb 2018 15:17:28 +0100 Subject: ssl: Prepare for release --- lib/ssl/vsn.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 1743a61cb7..8d955cd080 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 8.1.3.1 +SSL_VSN = 8.1.3.1.1 -- cgit v1.2.3