diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-09-11 10:53:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-09-11 10:53:32 +0200 |
| commit | 53b8f2bc723e7a9db8bb01b5c5a2292d12b30b14 (patch) | |
| tree | f9cf7f85b45ebc937edcddc3508f632fc390e330 /lib/ssl/src/ssl_handshake.erl | |
| parent | fd591b6f7bb681dd5335a67e66b1d0b8ecf2a76f (diff) | |
| parent | b7138087d757f3e4190af92386145a1d942b7b8b (diff) | |
| download | otp-53b8f2bc723e7a9db8bb01b5c5a2292d12b30b14.tar.gz otp-53b8f2bc723e7a9db8bb01b5c5a2292d12b30b14.tar.bz2 otp-53b8f2bc723e7a9db8bb01b5c5a2292d12b30b14.zip | |
Merge branch 'ingela/ssl/psk-correction/OTP-15285' into maint
* ingela/ssl/psk-correction/OTP-15285:
ssl: Correct handling of all PSK cipher suites
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index fa446081b3..3888f9dcf6 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1058,7 +1058,9 @@ select_curve(undefined, _, _) -> select_hashsign(_, _, KeyExAlgo, _, _Version) when KeyExAlgo == dh_anon; KeyExAlgo == ecdh_anon; KeyExAlgo == srp_anon; - KeyExAlgo == psk -> + KeyExAlgo == psk; + KeyExAlgo == dhe_psk; + KeyExAlgo == ecdhe_psk -> {null, anon}; %% The signature_algorithms extension was introduced with TLS 1.2. Ignore it if we have %% negotiated a lower version. |