aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/dtls_handshake.erl
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-19 10:36:00 +0100
committerZandra Hird <[email protected]>2015-03-19 10:36:17 +0100
commit2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (patch)
treec66710aa5e4dc7c7ac86c40cd49b6d3d47046930 /lib/ssl/src/dtls_handshake.erl
parent8f7756db0c1eec733e24d9fadef7c855981c6dc1 (diff)
parent7cf85926c11d38ce5ebd181f9f98185f359d64a3 (diff)
downloadotp-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/dtls_handshake.erl')
-rw-r--r--lib/ssl/src/dtls_handshake.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index 31d525b295..30381df050 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -181,8 +181,8 @@ 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.
dtls_fragment(Mss, MsgType, Len, MsgSeq, Bin, Offset, Acc)