aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-06-20 11:47:59 +0200
committerIngela Anderton Andin <[email protected]>2018-07-10 16:21:38 +0200
commit531d8a7a4ae8d255f023ea9196cd2ac4be915b6d (patch)
treed91e54eaa70f5f1810e3fc21215985f4324de7c5 /lib/ssl/src
parent06a3320c2358504af2a249058472e441908b2196 (diff)
downloadotp-531d8a7a4ae8d255f023ea9196cd2ac4be915b6d.tar.gz
otp-531d8a7a4ae8d255f023ea9196cd2ac4be915b6d.tar.bz2
otp-531d8a7a4ae8d255f023ea9196cd2ac4be915b6d.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')
-rw-r--r--lib/ssl/src/ssl_handshake.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 43ae312483..9ec522cd1c 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1029,7 +1029,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.