diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2019-09-23 12:35:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2019-09-23 12:35:14 +0200 |
| commit | caa469e0f817be0283a5211bdf7c2a87c9a325c8 (patch) | |
| tree | aed10c3d532421bfc90ed6f9d803ed83c9cc5c41 /lib/ssl/src/tls_handshake.erl | |
| parent | 70a3e70ce4fec9e5d79929aa28aecf4a81980322 (diff) | |
| parent | 34f226c6d7b3866444fcb5f6a0819af6c55f6224 (diff) | |
| download | erlang-caa469e0f817be0283a5211bdf7c2a87c9a325c8.tar.gz | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 203f89a0b8..18a5afc4f7 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -36,7 +36,7 @@ -include_lib("kernel/include/logger.hrl"). %% Handshake handling --export([client_hello/9, hello/4]). +-export([client_hello/8, hello/4]). %% Handshake encoding -export([encode_handshake/2]). @@ -51,18 +51,18 @@ %%==================================================================== %%-------------------------------------------------------------------- -spec client_hello(ssl:host(), inet:port_number(), ssl_record:connection_states(), - ssl_options(), integer(), atom(), boolean(), der_cert(), + ssl_options(), binary(), boolean(), der_cert(), #key_share_client_hello{} | undefined) -> #client_hello{}. %% %% Description: Creates a client hello message. %%-------------------------------------------------------------------- -client_hello(Host, Port, ConnectionStates, +client_hello(_Host, _Port, ConnectionStates, #{versions := Versions, ciphers := UserSuites, fallback := Fallback } = SslOpts, - Cache, CacheCb, Renegotiation, OwnCert, KeyShare) -> + Id, Renegotiation, _OwnCert, KeyShare) -> Version = tls_record:highest_protocol_version(Versions), %% In TLS 1.3, the client indicates its version preferences in the @@ -85,7 +85,6 @@ client_hello(Host, Port, ConnectionStates, Renegotiation, KeyShare), CipherSuites = ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation, Fallback), - Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert), #client_hello{session_id = Id, client_version = LegacyVersion, cipher_suites = CipherSuites, |