diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-07-05 15:08:18 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-07-05 15:08:18 +0200 |
| commit | 1ad63034139f1540957821406a2fd78ed0f5048d (patch) | |
| tree | 0adc385299231f20a6bed61c44535b2bf58d4b34 /lib/ssl/src | |
| parent | bc15cafa37d9b42b8676a40b3befea2e68cacd1b (diff) | |
| parent | f67bc13009002c23695a02e8323226bc03eca3f5 (diff) | |
| download | otp-1ad63034139f1540957821406a2fd78ed0f5048d.tar.gz otp-1ad63034139f1540957821406a2fd78ed0f5048d.tar.bz2 otp-1ad63034139f1540957821406a2fd78ed0f5048d.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 3 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index bd0057243d..2298e67d28 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1498,6 +1498,7 @@ connection_info(#state{sni_hostname = SNIHostname, [{protocol, RecordCB:protocol_version(Version)}, {session_id, SessionId}, {cipher_suite, ssl_cipher:erl_suite_definition(CipherSuiteDef)}, + {selected_cipher_suite, CipherSuiteDef}, {sni_hostname, SNIHostname} | CurveInfo] ++ ssl_options_list(Opts). security_info(#state{connection_states = ConnectionStates}) -> @@ -2538,7 +2539,7 @@ ssl_options_list([ciphers = Key | Keys], [Value | Values], Acc) -> ssl_options_list(Keys, Values, [{Key, lists:map( fun(Suite) -> - ssl_cipher:erl_suite_definition(Suite) + ssl_cipher:suite_definition(Suite) end, Value)} | Acc]); ssl_options_list([Key | Keys], [Value | Values], Acc) -> diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 3028ae9617..76fc7ae3d1 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1055,7 +1055,8 @@ select_curve(undefined, _, _) -> %%-------------------------------------------------------------------- select_hashsign(_, _, KeyExAlgo, _, _Version) when KeyExAlgo == dh_anon; KeyExAlgo == ecdh_anon; - KeyExAlgo == srp_anon -> + KeyExAlgo == srp_anon; + KeyExAlgo == psk -> {null, anon}; %% The signature_algorithms extension was introduced with TLS 1.2. Ignore it if we have %% negotiated a lower version. |