diff options
| author | Ingela Andin <[email protected]> | 2018-02-12 09:16:44 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-12 09:16:44 +0100 |
| commit | ee477c8d88d2139035c503e97e42e88fe500170f (patch) | |
| tree | 9ba46fb6cb606d3e9bd75214fbaf36b0c33a13af /lib/ssl/src | |
| parent | 9be186620d86b60791f20ddf5d051c63d576e737 (diff) | |
| parent | a5eb5642b84c6843611f718cfd105557f8a7a406 (diff) | |
| download | otp-ee477c8d88d2139035c503e97e42e88fe500170f.tar.gz otp-ee477c8d88d2139035c503e97e42e88fe500170f.tar.bz2 otp-ee477c8d88d2139035c503e97e42e88fe500170f.zip | |
Merge pull request #1709 from dumbbell/dumbbell/ssl/fix-active-once-dropped-when-handling-alert/ERL-562
ssl: Fix alert handling so that unexpected messages are logged and alerted correctly
Diffstat (limited to 'lib/ssl/src')
| -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 98776dcd59..63fae78195 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -999,8 +999,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 |