diff options
author | rtenneti <rtenneti@chromium.org> | 2015-06-24 09:26:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 16:27:28 +0000 |
commit | 807f9eadf6f21b17e220105db50ff14ced2ede96 (patch) | |
tree | 0c35d8b398a0476a56a63bb007e025b31f76ea8e /net/socket/ssl_client_socket_nss.cc | |
parent | 073cea5bb3d877e8cc8900ca6a20236e0e1ab6ac (diff) | |
download | chromium_src-807f9eadf6f21b17e220105db50ff14ced2ede96.zip chromium_src-807f9eadf6f21b17e220105db50ff14ced2ede96.tar.gz chromium_src-807f9eadf6f21b17e220105db50ff14ced2ede96.tar.bz2 |
SSLConfig - Added GetCertVerifyFlags to SSLConfig and shared the common
code with HttpStreamFactoryImpl::Job and SSLClientSocket*.*.
R=rch@chromium.org, rsleevi@chromium.org
Review URL: https://codereview.chromium.org/1202313004
Cr-Commit-Position: refs/heads/master@{#335934}
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
-rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index abd7524..6186bc2 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -3052,18 +3052,9 @@ int SSLClientSocketNSS::DoVerifyCert(int result) { start_cert_verification_time_ = base::TimeTicks::Now(); - int flags = 0; - if (ssl_config_.rev_checking_enabled) - flags |= CertVerifier::VERIFY_REV_CHECKING_ENABLED; - if (ssl_config_.verify_ev_cert) - flags |= CertVerifier::VERIFY_EV_CERT; - if (ssl_config_.cert_io_enabled) - flags |= CertVerifier::VERIFY_CERT_IO_ENABLED; - if (ssl_config_.rev_checking_required_local_anchors) - flags |= CertVerifier::VERIFY_REV_CHECKING_REQUIRED_LOCAL_ANCHORS; return cert_verifier_->Verify( core_->state().server_cert.get(), host_and_port_.host(), - core_->state().stapled_ocsp_response, flags, + core_->state().stapled_ocsp_response, ssl_config_.GetCertVerifyFlags(), SSLConfigService::GetCRLSet().get(), &server_cert_verify_result_, base::Bind(&SSLClientSocketNSS::OnHandshakeIOComplete, base::Unretained(this)), |