diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-07 15:27:31 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-07 15:43:02 +0100 |
| commit | a0360c361e7965f0cc3badfb61d04f48ddc69dc5 (patch) | |
| tree | 68848d84f3771747bffa547e617eb53df9ae15a9 /lib/ssl/src/tls_handshake.erl | |
| parent | 46d966b02f636807074ec9658a89d65415e7d7f7 (diff) | |
| parent | d8bbddd29dc2d30d8648ff6dd3006c5db0f6fd21 (diff) | |
| download | otp-a0360c361e7965f0cc3badfb61d04f48ddc69dc5.tar.gz otp-a0360c361e7965f0cc3badfb61d04f48ddc69dc5.tar.bz2 otp-a0360c361e7965f0cc3badfb61d04f48ddc69dc5.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_handshake.erl
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 5aca4bf8c8..644763651f 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -318,8 +318,6 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites, HelloExt, Version, SslOpts, Session0, ConnectionStates0, Renegotiation) of - #alert{} = Alert -> - Alert; {Session, ConnectionStates, Protocol, ServerHelloExt} -> {Version, {Type, Session}, ConnectionStates, Protocol, ServerHelloExt, HashSign} @@ -330,14 +328,14 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites, handle_server_hello_extensions(Version, SessionId, Random, CipherSuite, Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation) -> - case ssl_handshake:handle_server_hello_extensions(tls_record, Random, CipherSuite, + try ssl_handshake:handle_server_hello_extensions(tls_record, Random, CipherSuite, Compression, HelloExt, Version, SslOpt, ConnectionStates0, - Renegotiation) of - #alert{} = Alert -> - Alert; + Renegotiation) of {ConnectionStates, ProtoExt, Protocol} -> {Version, SessionId, ConnectionStates, ProtoExt, Protocol} + catch throw:Alert -> + Alert end. |