diff options
| author | Zandra Hird <[email protected]> | 2015-03-19 10:36:00 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-19 10:36:17 +0100 |
| commit | 2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (patch) | |
| tree | c66710aa5e4dc7c7ac86c40cd49b6d3d47046930 /lib/ssl/src/tls_handshake.erl | |
| parent | 8f7756db0c1eec733e24d9fadef7c855981c6dc1 (diff) | |
| parent | 7cf85926c11d38ce5ebd181f9f98185f359d64a3 (diff) | |
| download | otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.gz otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.bz2 otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.zip | |
Merge branch 'essen/ssl-alpn'
* essen/ssl-alpn:
ssl: Add TLS-ALPN support
OTP-12580
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 548ec4aebe..2d50dd7e46 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -245,8 +245,10 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites, try ssl_handshake:handle_client_hello_extensions(tls_record, Random, CipherSuites, HelloExt, Version, SslOpts, Session0, ConnectionStates0, Renegotiation) of - {Session, ConnectionStates, ServerHelloExt} -> - {Version, {Type, Session}, ConnectionStates, ServerHelloExt} + #alert{} = Alert -> + Alert; + {Session, ConnectionStates, Protocol, ServerHelloExt} -> + {Version, {Type, Session}, ConnectionStates, Protocol, ServerHelloExt} catch throw:Alert -> Alert end. @@ -259,7 +261,7 @@ handle_server_hello_extensions(Version, SessionId, Random, CipherSuite, SslOpt, ConnectionStates0, Renegotiation) of #alert{} = Alert -> Alert; - {ConnectionStates, Protocol} -> - {Version, SessionId, ConnectionStates, Protocol} + {ConnectionStates, ProtoExt, Protocol} -> + {Version, SessionId, ConnectionStates, ProtoExt, Protocol} end. |