summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 02:00:47 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 02:00:47 +0000
commit8738e0d716b5c073f0a7efff5abf883799c27600 (patch)
tree79923f34f3674ab24505889606b0bbfe0e27c7d3 /net/socket
parentbdc10063ed1ae1d8941f7dcb43bc5e4b6fbf6d60 (diff)
downloadchromium_src-8738e0d716b5c073f0a7efff5abf883799c27600.zip
chromium_src-8738e0d716b5c073f0a7efff5abf883799c27600.tar.gz
chromium_src-8738e0d716b5c073f0a7efff5abf883799c27600.tar.bz2
Rename X509Certificate::VerifyFlags to CertVerifier::VerifyFlags
Now that verification happens in CertVerifier::Verify(), the flags should be moved from X509Certificate into CertVerifier BUG=none Review URL: https://chromiumcodereview.appspot.com/10855168 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_mac.cc6
-rw-r--r--net/socket/ssl_client_socket_nss.cc6
-rw-r--r--net/socket/ssl_client_socket_openssl.cc6
-rw-r--r--net/socket/ssl_client_socket_win.cc6
4 files changed, 12 insertions, 12 deletions
diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index fb2e97a..53ab1fb 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -1170,11 +1170,11 @@ int SSLClientSocketMac::DoVerifyCert() {
int flags = 0;
if (ssl_config_.rev_checking_enabled)
- flags |= X509Certificate::VERIFY_REV_CHECKING_ENABLED;
+ flags |= CertVerifier::VERIFY_REV_CHECKING_ENABLED;
if (ssl_config_.verify_ev_cert)
- flags |= X509Certificate::VERIFY_EV_CERT;
+ flags |= CertVerifier::VERIFY_EV_CERT;
if (ssl_config_.cert_io_enabled)
- flags |= X509Certificate::VERIFY_CERT_IO_ENABLED;
+ flags |= CertVerifier::VERIFY_CERT_IO_ENABLED;
verifier_.reset(new SingleRequestCertVerifier(cert_verifier_));
return verifier_->Verify(
server_cert_, host_and_port_.host(), flags,
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 21089d5..a21b743 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -3369,11 +3369,11 @@ int SSLClientSocketNSS::DoVerifyCert(int result) {
int flags = 0;
if (ssl_config_.rev_checking_enabled)
- flags |= X509Certificate::VERIFY_REV_CHECKING_ENABLED;
+ flags |= CertVerifier::VERIFY_REV_CHECKING_ENABLED;
if (ssl_config_.verify_ev_cert)
- flags |= X509Certificate::VERIFY_EV_CERT;
+ flags |= CertVerifier::VERIFY_EV_CERT;
if (ssl_config_.cert_io_enabled)
- flags |= X509Certificate::VERIFY_CERT_IO_ENABLED;
+ flags |= CertVerifier::VERIFY_CERT_IO_ENABLED;
verifier_.reset(new SingleRequestCertVerifier(cert_verifier_));
return verifier_->Verify(
core_->state().server_cert, host_and_port_.host(), flags,
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index d03e093..61ab8d1 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -918,11 +918,11 @@ int SSLClientSocketOpenSSL::DoVerifyCert(int result) {
int flags = 0;
if (ssl_config_.rev_checking_enabled)
- flags |= X509Certificate::VERIFY_REV_CHECKING_ENABLED;
+ flags |= CertVerifier::VERIFY_REV_CHECKING_ENABLED;
if (ssl_config_.verify_ev_cert)
- flags |= X509Certificate::VERIFY_EV_CERT;
+ flags |= CertVerifier::VERIFY_EV_CERT;
if (ssl_config_.cert_io_enabled)
- flags |= X509Certificate::VERIFY_CERT_IO_ENABLED;
+ flags |= CertVerifier::VERIFY_CERT_IO_ENABLED;
verifier_.reset(new SingleRequestCertVerifier(cert_verifier_));
return verifier_->Verify(
server_cert_, host_and_port_.host(), flags,
diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc
index 1bf8334..253ec4c 100644
--- a/net/socket/ssl_client_socket_win.cc
+++ b/net/socket/ssl_client_socket_win.cc
@@ -1194,11 +1194,11 @@ int SSLClientSocketWin::DoVerifyCert() {
int flags = 0;
if (ssl_config_.rev_checking_enabled)
- flags |= X509Certificate::VERIFY_REV_CHECKING_ENABLED;
+ flags |= CertVerifier::VERIFY_REV_CHECKING_ENABLED;
if (ssl_config_.verify_ev_cert)
- flags |= X509Certificate::VERIFY_EV_CERT;
+ flags |= CertVerifier::VERIFY_EV_CERT;
if (ssl_config_.cert_io_enabled)
- flags |= X509Certificate::VERIFY_CERT_IO_ENABLED;
+ flags |= CertVerifier::VERIFY_CERT_IO_ENABLED;
verifier_.reset(new SingleRequestCertVerifier(cert_verifier_));
return verifier_->Verify(
server_cert_, host_and_port_.host(), flags,