diff options
author | Ingela Anderton Andin <[email protected]> | 2017-12-05 10:27:09 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-12-05 10:31:37 +0100 |
commit | 0ac5b1f06939e36a512e5c54331e09105e127704 (patch) | |
tree | 226435555b2c3440a591805eb5508bd2e7b1e0a0 /lib/ssl/src/tls_handshake.erl | |
parent | 09bd72adbb5f5751995cfce9c02fb812da97f558 (diff) | |
parent | e211aa22eb1a07fb60462cce449cd92f3491063b (diff) | |
download | otp-0ac5b1f06939e36a512e5c54331e09105e127704.tar.gz otp-0ac5b1f06939e36a512e5c54331e09105e127704.tar.bz2 otp-0ac5b1f06939e36a512e5c54331e09105e127704.zip |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_cipher.erl
lib/ssl/src/ssl_handshake.erl
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
-rw-r--r-- | lib/ssl/src/tls_handshake.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index a38c5704a6..d59e817ffb 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -203,7 +203,7 @@ handle_client_hello(Version, no_suite -> ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_ciphers); _ -> - {KeyExAlg,_,_,_} = ssl_cipher:suite_definition(CipherSuite), + #{key_exchange := KeyExAlg} = ssl_cipher:suite_definition(CipherSuite), case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, SupportedHashSigns, Version) of #alert{} = Alert -> |