diff options
author | Ingela Anderton Andin <[email protected]> | 2018-08-22 12:17:19 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-08-22 12:17:19 +0200 |
commit | 9a95f6f1cda59e337b11f5213c932f7fbdc17a61 (patch) | |
tree | c8aa4529c63665e313d2016dda184121242688ad /lib/ssl/src/tls_handshake.erl | |
parent | 1b9829f78970547659d73ed5d437f0b66d69c40f (diff) | |
parent | 669419137b631b895efce327e0aee9ace03c2ba0 (diff) | |
download | otp-9a95f6f1cda59e337b11f5213c932f7fbdc17a61.tar.gz otp-9a95f6f1cda59e337b11f5213c932f7fbdc17a61.tar.bz2 otp-9a95f6f1cda59e337b11f5213c932f7fbdc17a61.zip |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_cipher.erl
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
-rw-r--r-- | lib/ssl/src/tls_handshake.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 2ad1386900..6812d3b42a 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -94,13 +94,13 @@ client_hello(Host, Port, ConnectionStates, -spec hello(#server_hello{} | #client_hello{}, #ssl_options{}, ssl_record:connection_states() | {inet:port_number(), #session{}, db_handle(), atom(), ssl_record:connection_states(), - binary() | undefined, ssl_cipher:key_algo()}, + binary() | undefined, ssl_cipher_format:key_algo()}, boolean()) -> {tls_record:tls_version(), session_id(), ssl_record:connection_states(), alpn | npn, binary() | undefined}| {tls_record:tls_version(), {resumed | new, #session{}}, ssl_record:connection_states(), binary() | undefined, - #hello_extensions{}, {ssl_cipher:hash(), ssl_cipher:sign_algo()} | + #hello_extensions{}, {ssl_cipher_format:hash(), ssl_cipher_format:sign_algo()} | undefined} | #alert{}. %% %% Description: Handles a received hello message @@ -291,7 +291,7 @@ handle_client_hello(Version, no_suite -> ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_ciphers); _ -> - #{key_exchange := KeyExAlg} = ssl_cipher:suite_definition(CipherSuite), + #{key_exchange := KeyExAlg} = ssl_cipher_format:suite_definition(CipherSuite), case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, SupportedHashSigns, Version) of #alert{} = Alert -> |