diff options
| author | Erlang/OTP <[email protected]> | 2018-02-28 12:13:43 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-02-28 12:13:43 +0100 |
| commit | ab3c8919df9cbcf58b7e285d04ff0fb19a25891a (patch) | |
| tree | 093d6b5492e6c57a3e9d6d3132fd1bfc2381adf0 | |
| parent | 5814acb88d84fd13573bc04de2acbe64398eb749 (diff) | |
| parent | f4e5f4fa890591a06a28aa9e4459fb2d9f5201d4 (diff) | |
| download | otp-ab3c8919df9cbcf58b7e285d04ff0fb19a25891a.tar.gz otp-ab3c8919df9cbcf58b7e285d04ff0fb19a25891a.tar.bz2 otp-ab3c8919df9cbcf58b7e285d04ff0fb19a25891a.zip | |
Merge branch 'ingela/ssl/PR-1709/OTP-14929' into maint-19
* ingela/ssl/PR-1709/OTP-14929:
ssl: Prepare for release
ssl: Backport PR-1709
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 3 insertions, 3 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 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 |