diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-06-20 11:47:59 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-07-04 10:11:06 +0200 |
| commit | e6d9c7eb9e62e220bfb6a5e1b5c1b991c7b9c121 (patch) | |
| tree | dc354af6af286d66bad8e9cd9aa4e0455b90c945 /lib/ssl/src/ssl_handshake.erl | |
| parent | e4529b82e0f2980a8b3f4b961dc18ff1fdd43d8e (diff) | |
| download | otp-e6d9c7eb9e62e220bfb6a5e1b5c1b991c7b9c121.tar.gz otp-e6d9c7eb9e62e220bfb6a5e1b5c1b991c7b9c121.tar.bz2 otp-e6d9c7eb9e62e220bfb6a5e1b5c1b991c7b9c121.zip | |
ssl: Add psk as anonymous key exchange in ssl_handshake:select_hashsign/5
Failing to recognize psk as an anonymous key exchange would fail the connection
when trying to decode an undefined certificate.
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. |