diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-12-20 09:47:25 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-12-20 09:47:25 +0100 |
| commit | 9aac178d30c5bad940e68a7eb8a36596df5ed903 (patch) | |
| tree | 272b88739acddd9170d5f0dacfc5cb886258e832 /lib/ssl/src/ssl_connection.erl | |
| parent | 800133f2251cb519edb01c9db9c27cd15f9d6dc0 (diff) | |
| parent | a10200ce143a32c7c15e804e9f401a0904bb49ef (diff) | |
| download | otp-9aac178d30c5bad940e68a7eb8a36596df5ed903.tar.gz otp-9aac178d30c5bad940e68a7eb8a36596df5ed903.tar.bz2 otp-9aac178d30c5bad940e68a7eb8a36596df5ed903.zip | |
Merge branch 'ingela/ssl/renegotiate-with-new-tls-sender/ERL-803/OTP-15489' into maint
* ingela/ssl/renegotiate-with-new-tls-sender/ERL-803/OTP-15489:
ssl: Fix renegotiation with new TLS sender
ssl: Add renegotiate test case
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index e8c8120f50..41d853977e 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1147,7 +1147,7 @@ handle_common_event(internal, {handshake, {#hello_request{} = Handshake, _}}, co handle_common_event(internal, {handshake, {#hello_request{}, _}}, StateName, #state{static_env = #static_env{role = client}}, _) when StateName =/= connection -> - {keep_state_and_data}; + keep_state_and_data; handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName, #state{tls_handshake_history = Hs0} = State0, Connection) -> |