diff options
| author | Bruce Yinhe <[email protected]> | 2014-07-07 15:58:43 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-07-07 15:58:43 +0200 |
| commit | a801af8e99b847bc4bd00bf8ba76a638ff90768f (patch) | |
| tree | 4158f47cd7541b92af29f47fbc53f5af6b312f2a /lib/ssl/src | |
| parent | eb0506045fffe52ab5c34779311ec63ef6aabbb0 (diff) | |
| parent | 34e4094aabccc22b5b1be609eb8dfbe412dd4328 (diff) | |
| download | otp-a801af8e99b847bc4bd00bf8ba76a638ff90768f.tar.gz otp-a801af8e99b847bc4bd00bf8ba76a638ff90768f.tar.bz2 otp-a801af8e99b847bc4bd00bf8ba76a638ff90768f.zip | |
Merge branch 'dnet/parse_sni' into maint
* dnet/parse_sni:
added SNI decode test to SSL handshake suite
ssl: parse SNI in received client hello records
OTP-12048
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index fc67d2c28d..b018332df1 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1719,6 +1719,11 @@ dec_hello_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len), dec_hello_extensions(Rest, Acc#hello_extensions{ec_point_formats = #ec_point_formats{ec_point_format_list = ECPointFormats}}); + +dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), + ExtData:Len/binary, Rest/binary>>, Acc) -> + <<?UINT16(_), NameList/binary>> = ExtData, + dec_hello_extensions(Rest, Acc#hello_extensions{sni = dec_sni(NameList)}); %% Ignore data following the ClientHello (i.e., %% extensions) if not understood. @@ -1731,6 +1736,13 @@ dec_hello_extensions(_, Acc) -> dec_hashsign(<<?BYTE(HashAlgo), ?BYTE(SignAlgo)>>) -> {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)}. +%% Ignore unknown names (only host_name is supported) +dec_sni(<<?BYTE(?SNI_NAMETYPE_HOST_NAME), ?UINT16(Len), + HostName:Len/binary, _/binary>>) -> + #sni{hostname = binary_to_list(HostName)}; +dec_sni(<<?BYTE(_), ?UINT16(Len), _:Len, Rest/binary>>) -> dec_sni(Rest); +dec_sni(_) -> undefined. + decode_next_protocols({next_protocol_negotiation, Protocols}) -> decode_next_protocols(Protocols, []). decode_next_protocols(<<>>, Acc) -> |