diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-04-29 14:21:24 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-04-29 14:21:24 +0200 |
| commit | d93043ca0839e659abada62b0c6cf4d441808acf (patch) | |
| tree | 88f74177c6778a358ead9d8583d1a2559e94acd9 /lib/ssl/src/ssl_connection.erl | |
| parent | d0f2388935c6ef7e430bd0bc03eea6307e38a136 (diff) | |
| parent | 69833e8f64e900eece91f5430c2462dd584fff31 (diff) | |
| download | otp-d93043ca0839e659abada62b0c6cf4d441808acf.tar.gz otp-d93043ca0839e659abada62b0c6cf4d441808acf.tar.bz2 otp-d93043ca0839e659abada62b0c6cf4d441808acf.zip | |
Merge branch 'as/fix-srp-psk-anon/OTP-11071' into maint
* as/fix-srp-psk-anon/OTP-11071:
fix srp_anon ciphers suites requiring certificates to work.
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 1843377582..fa64915fd0 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1547,7 +1547,7 @@ server_hello_done(#state{transport_cb = Transport, tls_handshake_history = Handshake}. certify_server(#state{key_algorithm = Algo} = State) - when Algo == dh_anon; Algo == psk; Algo == dhe_psk -> + when Algo == dh_anon; Algo == psk; Algo == dhe_psk; Algo == srp_anon -> State; certify_server(#state{transport_cb = Transport, |