diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-09-25 13:32:22 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-09-25 13:32:22 +0200 |
| commit | a15acb2cd18fb086abdfb54b37b0dd79199f7e61 (patch) | |
| tree | fd86522cff354842ccb41ad9f6767f17c32c40d1 /lib/ssl/src/ssl_handshake.erl | |
| parent | a686ba1fd59fba3448e09cf6e33ca093f0a490ff (diff) | |
| parent | 3b1328d0eaecede8e42b0838f9920e413a19c8d6 (diff) | |
| download | otp-a15acb2cd18fb086abdfb54b37b0dd79199f7e61.tar.gz otp-a15acb2cd18fb086abdfb54b37b0dd79199f7e61.tar.bz2 otp-a15acb2cd18fb086abdfb54b37b0dd79199f7e61.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 0c9022b85d..07535e79b4 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1733,6 +1733,9 @@ dec_hello_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len), #ec_point_formats{ec_point_format_list = ECPointFormats}}); +dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), Rest/binary>>, Acc) when Len == 0 -> + dec_hello_extensions(Rest, Acc#hello_extensions{sni = ""}); %% Server may send an empy SNI + dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), ExtData:Len/binary, Rest/binary>>, Acc) -> <<?UINT16(_), NameList/binary>> = ExtData, |