diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-02-12 10:30:00 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-02-12 10:30:00 +0100 |
| commit | 5e7286acceec0811fd95898c7337921ac91c97b4 (patch) | |
| tree | 83d39a02e82277cc5cc55d3c6f354cc7f8bd019b | |
| parent | cd9b6371a13c37f8f82586fcd82f212d306d8fad (diff) | |
| parent | ee477c8d88d2139035c503e97e42e88fe500170f (diff) | |
| download | otp-5e7286acceec0811fd95898c7337921ac91c97b4.tar.gz otp-5e7286acceec0811fd95898c7337921ac91c97b4.tar.bz2 otp-5e7286acceec0811fd95898c7337921ac91c97b4.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index d046145dff..2031735a71 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1148,8 +1148,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 |