diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-27 10:17:22 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-27 10:17:22 +0200 |
| commit | 2e96bd45aeab647a839cd8b0a0741267cc0a70e5 (patch) | |
| tree | e0df325de559ff67f3a6d357d391fa9bc49e35cf /lib/ssl/src/ssl.erl | |
| parent | 0a1f48c46cf629af7d3719e94250733d1589efa1 (diff) | |
| parent | 266ea3592e49cc93e69735eea4572e95fedc6a19 (diff) | |
| download | otp-2e96bd45aeab647a839cd8b0a0741267cc0a70e5.tar.gz otp-2e96bd45aeab647a839cd8b0a0741267cc0a70e5.tar.bz2 otp-2e96bd45aeab647a839cd8b0a0741267cc0a70e5.zip | |
Merge branch 'ia/ssl-and-public_key/backwards-compatibility/OTP-8858' into dev
* ia/ssl-and-public_key/backwards-compatibility/OTP-8858:
Backwards compatibility
Conflicts:
lib/ssl/src/ssl_certificate_db.erl
Use short INFO-message. Debugging information can be fairly
easily recreated so we do not want to clutter the logs.
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 314bdd1aab..c13dee96f1 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -621,17 +621,17 @@ handle_options(Opts0, _Role) -> ReuseSessionFun = fun(_, _, _, _) -> true end, - VerifyNoneFun = - {fun(_,{bad_cert, unknown_ca}, UserState) -> + DefaultVerifyNoneFun = + {fun(_,{bad_cert, _}, UserState) -> {valid, UserState}; - (_,{bad_cert, _} = Reason, _) -> - {fail, Reason}; (_,{extension, _}, UserState) -> {unknown, UserState}; (_, valid, UserState) -> {valid, UserState} end, []}, + VerifyNoneFun = handle_option(verify_fun, Opts, DefaultVerifyNoneFun), + UserFailIfNoPeerCert = handle_option(fail_if_no_peer_cert, Opts, false), UserVerifyFun = handle_option(verify_fun, Opts, undefined), CaCerts = handle_option(cacerts, Opts, undefined), |