From 807f9eadf6f21b17e220105db50ff14ced2ede96 Mon Sep 17 00:00:00 2001 From: rtenneti Date: Wed, 24 Jun 2015 09:26:31 -0700 Subject: 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} --- net/socket/ssl_client_socket_nss.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'net/socket/ssl_client_socket_nss.cc') 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)), -- cgit v1.1