diff options
| author | Erlang/OTP <[email protected]> | 2018-08-09 17:28:30 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-08-09 17:28:30 +0200 |
| commit | 4800273fc10934eac12411f7b613a57c76262157 (patch) | |
| tree | 36f77e47facf450785c60166310af0bda98e43e7 | |
| parent | dc4853b3073115c922d22d2a436c1f67840bd2f0 (diff) | |
| parent | ebc10f445fc4ddda90c2e0888baf310a9370cb33 (diff) | |
| download | otp-4800273fc10934eac12411f7b613a57c76262157.tar.gz otp-4800273fc10934eac12411f7b613a57c76262157.tar.bz2 otp-4800273fc10934eac12411f7b613a57c76262157.zip | |
Merge branch 'ingela/ssl/empty-sni/OTP-15168' into maint-20
* ingela/ssl/empty-sni/OTP-15168:
ssl: Correct handling of empty server SNI extension
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_handshake_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 49fb76118a..cd601c04c0 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1850,7 +1850,7 @@ dec_hello_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len), 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(Rest, Acc#hello_extensions{sni = #sni{hostname = ""}}); %% Server may send an empy SNI dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), ExtData:Len/binary, Rest/binary>>, Acc) -> diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl index 9658cb5f56..c492c54066 100644 --- a/lib/ssl/test/ssl_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_handshake_SUITE.erl @@ -157,7 +157,7 @@ decode_single_hello_sni_extension_correctly(_Config) -> Exts = Decoded. decode_empty_server_sni_correctly(_Config) -> - Exts = #hello_extensions{sni = ""}, + Exts = #hello_extensions{sni = #sni{hostname = ""}}, SNI = <<?UINT16(?SNI_EXT),?UINT16(0)>>, Decoded = ssl_handshake:decode_hello_extensions(SNI), Exts = Decoded. |