diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-09-11 10:55:38 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-09-11 10:55:38 +0200 |
| commit | 4bbaca5662ece19e58c3667e0c691fc5d3103ac0 (patch) | |
| tree | e60ceee1632d8d04e28ef142ce624e3d8a7f84a0 /lib/ssl/src/ssl_handshake.erl | |
| parent | 2eccf112d0ed6d0736562ca5260740cc670b7ddb (diff) | |
| parent | 53b8f2bc723e7a9db8bb01b5c5a2292d12b30b14 (diff) | |
| download | otp-4bbaca5662ece19e58c3667e0c691fc5d3103ac0.tar.gz otp-4bbaca5662ece19e58c3667e0c691fc5d3103ac0.tar.bz2 otp-4bbaca5662ece19e58c3667e0c691fc5d3103ac0.zip | |
Merge branch 'maint'
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 467a8e27a9..54197ea0f3 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1109,7 +1109,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. |