diff options
| author | Ingela Andin <[email protected]> | 2018-07-05 15:04:29 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-05 15:04:29 +0200 |
| commit | f67bc13009002c23695a02e8323226bc03eca3f5 (patch) | |
| tree | b9dbadd8410bbaad6d16cf39cf2eb120dd681152 /lib/ssl/src/ssl_handshake.erl | |
| parent | 99789794474140049a1939c4e4789b28dfe80e49 (diff) | |
| parent | f610e27fe71d0b6a19eb836c3d13cc8de610b9ef (diff) | |
| download | otp-f67bc13009002c23695a02e8323226bc03eca3f5.tar.gz otp-f67bc13009002c23695a02e8323226bc03eca3f5.tar.bz2 otp-f67bc13009002c23695a02e8323226bc03eca3f5.zip | |
Merge pull request #1866 from IngelaAndin/ingela/ssl/PSK-hash-sign-selection/ERL-641
Failing to recognize PSK as an anonymous key exchange would fail the connection
when trying to decode an undefined certificate
OTP-15172
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 3 |
1 files changed, 2 insertions, 1 deletions
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. |