summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 19:50:49 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 19:50:49 +0000
commita642e33d47c90f20cac2e7f0db0adc792dc7931a (patch)
tree49ed3cbe28f49a2739a7a5bb8e66ac46ed46ffeb /net
parent0d7b779fcdc41a2cc22f7ab776d9d53f46bcab1f (diff)
downloadchromium_src-a642e33d47c90f20cac2e7f0db0adc792dc7931a.zip
chromium_src-a642e33d47c90f20cac2e7f0db0adc792dc7931a.tar.gz
chromium_src-a642e33d47c90f20cac2e7f0db0adc792dc7931a.tar.bz2
Fix redux build
Add (unimplemented) crl_set param BUG=None TEST=linux_redux goes green Review URL: http://codereview.chromium.org/8394008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/x509_certificate_openssl.cc1
-rw-r--r--net/base/x509_certificate_openssl_android.cc1
-rw-r--r--net/socket/ssl_client_socket_openssl.cc1
3 files changed, 3 insertions, 0 deletions
diff --git a/net/base/x509_certificate_openssl.cc b/net/base/x509_certificate_openssl.cc
index 8cc4ef0..a0601a7 100644
--- a/net/base/x509_certificate_openssl.cc
+++ b/net/base/x509_certificate_openssl.cc
@@ -428,6 +428,7 @@ X509_STORE* X509Certificate::cert_store() {
int X509Certificate::VerifyInternal(const std::string& hostname,
int flags,
+ CRLSet* crl_set,
CertVerifyResult* verify_result) const {
if (!VerifyNameMatch(hostname))
verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID;
diff --git a/net/base/x509_certificate_openssl_android.cc b/net/base/x509_certificate_openssl_android.cc
index 4e1bbd2..fa01c57 100644
--- a/net/base/x509_certificate_openssl_android.cc
+++ b/net/base/x509_certificate_openssl_android.cc
@@ -14,6 +14,7 @@ namespace net {
int X509Certificate::VerifyInternal(const std::string& hostname,
int flags,
+ CRLSet* crl_set,
CertVerifyResult* verify_result) const {
if (!VerifyNameMatch(hostname))
verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID;
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 7b70ac4..eeea188 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -836,6 +836,7 @@ int SSLClientSocketOpenSSL::DoVerifyCert(int result) {
verifier_.reset(new SingleRequestCertVerifier(cert_verifier_));
return verifier_->Verify(
server_cert_, host_and_port_.host(), flags,
+ NULL /* no CRL set */,
&server_cert_verify_result_,
base::Bind(&SSLClientSocketOpenSSL::OnHandshakeIOComplete,
base::Unretained(this)),