diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-22 11:21:43 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-22 11:21:43 +0200 |
| commit | 50d781793027157fc3a8ebf24c7bd7610c2752a7 (patch) | |
| tree | b5869a41c18f3547f7e53eeb5c2664d53269fb7a /lib/ssl/src/tls_handshake.erl | |
| parent | 10380538d823358aa6f819b784bbc4c44bdf2862 (diff) | |
| parent | ec0f8d69a98b08b2effd07121b5f87e327d370ee (diff) | |
| download | otp-50d781793027157fc3a8ebf24c7bd7610c2752a7.tar.gz otp-50d781793027157fc3a8ebf24c7bd7610c2752a7.tar.bz2 otp-50d781793027157fc3a8ebf24c7bd7610c2752a7.zip | |
Merge branch 'ingela/ssl/restructure-tests' into maint
* ingela/ssl/restructure-tests:
ssl: Add API suites
ssl: Covered by property tests
ssl: Correct RSP/PSK and ALPN handling
ssl: Better grouping of test
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index c132f75eae..37265e0759 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -379,7 +379,7 @@ do_hello(Version, Versions, CipherSuites, Hello, SslOpts, Info, Renegotiation) - %%-------------------------------------------------------------------- enc_handshake(#hello_request{}, {3, N}) when N < 4 -> {?HELLO_REQUEST, <<>>}; -enc_handshake(#client_hello{client_version = {Major, Minor}, +enc_handshake(#client_hello{client_version = {Major, Minor} = Version, random = Random, session_id = SessionID, cipher_suites = CipherSuites, @@ -390,7 +390,7 @@ enc_handshake(#client_hello{client_version = {Major, Minor}, CmLength = byte_size(BinCompMethods), BinCipherSuites = list_to_binary(CipherSuites), CsLength = byte_size(BinCipherSuites), - ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions), + ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions, Version), {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary, ?BYTE(SIDLength), SessionID/binary, |