diff options
author | Fredrik Gustafsson <[email protected]> | 2013-04-29 14:21:37 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-04-29 14:21:37 +0200 |
commit | 0c5dc8d7a6079706dfdf44d4abc22e756eb12863 (patch) | |
tree | c760ffc2eca2f299231e6fe57d840e6f89dd5b08 /lib/ssl/src/ssl_connection.erl | |
parent | 719fac2c21adaa2cdcc47506f1a19434e5315fa3 (diff) | |
parent | d93043ca0839e659abada62b0c6cf4d441808acf (diff) | |
download | otp-0c5dc8d7a6079706dfdf44d4abc22e756eb12863.tar.gz otp-0c5dc8d7a6079706dfdf44d4abc22e756eb12863.tar.bz2 otp-0c5dc8d7a6079706dfdf44d4abc22e756eb12863.zip |
Merge branch 'maint'
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, |