diff options
author | Ingela Anderton Andin <[email protected]> | 2010-09-07 09:20:52 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-09-07 09:20:52 +0200 |
commit | 4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d (patch) | |
tree | 097374e0392e44f00ab1e54e697214fdbfc301f6 /lib/ssl/src/ssl_connection.erl | |
parent | e37663d48f048c5948f882a34e3ad761ca4db762 (diff) | |
parent | 71e720e56888faa6da3856d5c5e08c8e983c9d5d (diff) | |
download | otp-4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d.tar.gz otp-4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d.tar.bz2 otp-4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d.zip |
Merge branch 'ia/ssl/server-verify-fun/OTP-8770' into dev
* ia/ssl/server-verify-fun/OTP-8770:
Handling of path validation errors by the application
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
-rw-r--r-- | lib/ssl/src/ssl_connection.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index c004effb85..7689976ff6 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -500,8 +500,7 @@ certify(#certificate{} = Cert, ssl_options = Opts} = State) -> case ssl_handshake:certify(Cert, CertDbRef, Opts#ssl_options.depth, Opts#ssl_options.verify, - Opts#ssl_options.verify_fun, - Opts#ssl_options.validate_extensions_fun, Role) of + Opts#ssl_options.verify_fun, Role) of {PeerCert, PublicKeyInfo} -> handle_peer_cert(PeerCert, PublicKeyInfo, State#state{client_certificate_requested = false}); |