aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorRory Byrne <[email protected]>2010-03-31 20:10:18 +0100
committerRory Byrne <[email protected]>2010-04-05 14:04:21 +0100
commitc75443977b2957c8f0d35b0765c5a8b8859315f2 (patch)
treea6453f5ac0b3b481b1622b04cb98b6bff3263eba /lib/ssl/src
parent3fe4b0e254ef9d76aeb2029eb134056e9cc2234f (diff)
downloadotp-c75443977b2957c8f0d35b0765c5a8b8859315f2.tar.gz
otp-c75443977b2957c8f0d35b0765c5a8b8859315f2.tar.bz2
otp-c75443977b2957c8f0d35b0765c5a8b8859315f2.zip
Fix mishandling of valid ssl options
Using certain valid options in the new ssl implementation results in badarg exceptions. This happens for one documented option 'fail_if_no_peer_cert' and two undocumented options 'verify_client_once' and 'cb_info'.
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 87a0939897..965e40a109 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -560,10 +560,11 @@ handle_options(Opts0, Role) ->
CbInfo = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed}),
SslOptions = [versions, verify, verify_fun,
+ fail_if_no_peer_cert, verify_client_once,
depth, certfile, keyfile,
key, password, cacertfile, dhfile, ciphers,
debug, reuse_session, reuse_sessions, ssl_imp,
- cd_info, renegotiate_at],
+ cb_info, renegotiate_at],
SockOpts = lists:foldl(fun(Key, PropList) ->
proplists:delete(Key, PropList)