diff options
| author | Rickard Green <[email protected]> | 2018-08-10 13:00:17 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-10 13:00:17 +0200 |
| commit | b55b9d7b824f5797b0a4f6c6316f716e92e3267f (patch) | |
| tree | ae334a305ac5951b9bad4af38604ecf61b86dacf /lib/ssl/src/ssl_handshake.erl | |
| parent | 2e46944fce477abc44e5631766b580b6ed62a1a4 (diff) | |
| parent | 8cb79ba4d3b665e06a39c3437d7227c831753945 (diff) | |
| download | otp-b55b9d7b824f5797b0a4f6c6316f716e92e3267f.tar.gz otp-b55b9d7b824f5797b0a4f6c6316f716e92e3267f.tar.bz2 otp-b55b9d7b824f5797b0a4f6c6316f716e92e3267f.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
crypto: Fix crash in compute_key(ecdh, ...) on badarg
Relax add_table_copy restriction
Fixed #Ref ordering bug
Test #Ref ordering in lists and ets
Do NOT disc_load from ram_copies when master_node is set
ssl: Make sure that a correct cipher suite is selected
ssl: Correct handling of empty server SNI extension
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 98e9d9da7e..73757e6b65 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1985,7 +1985,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) -> |