summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-27 19:00:57 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-27 19:00:57 +0000
commit5c50419ebf62ec9aecf03683217d53de340b5f6f (patch)
tree624da3d70a3df9096acead1cb633c2ce7009f86c /net
parentfc6950445d8f5d5ca60deb5ae065949ef346322f (diff)
downloadchromium_src-5c50419ebf62ec9aecf03683217d53de340b5f6f.zip
chromium_src-5c50419ebf62ec9aecf03683217d53de340b5f6f.tar.gz
chromium_src-5c50419ebf62ec9aecf03683217d53de340b5f6f.tar.bz2
Disable EV/CRLSet tests when USE_OPENSSL is defined.
The experimental OpenSSL stack in Chromium does not yet support EV status, OCSP, or CRLs, so disable these tests for now. BUG=117478 TEST=linux_redux is green Review URL: http://codereview.chromium.org/9861024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request_unittest.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 859f3f5..f5b3561 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1375,8 +1375,8 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) {
}
}
-// http://crbug.com/119642 - The Android test server does not support
-// generating OCSP responses on the fly.
+// Disabled on Android - http://crbug.com/119642 - The Android test server
+// does not support generating OCSP responses on the fly.
#if !defined(OS_ANDROID)
class TestSSLConfigService : public SSLConfigService {
@@ -1485,7 +1485,10 @@ static CertStatus ExpectedCertStatusForFailedOnlineRevocationCheck() {
// several tests are effected because our testing EV certificate won't be
// recognised as EV.
static bool SystemUsesChromiumEVMetadata() {
-#if defined(OS_MACOSX)
+#if defined(USE_OPENSSL)
+ // http://crbug.com/117478 - OpenSSL does not support EV validation.
+ return false;
+#elif defined(OS_MACOSX)
// On OS X, we use the system to tell us whether a certificate is EV or not
// and the system won't recognise our testing root.
return false;
@@ -1496,7 +1499,10 @@ static bool SystemUsesChromiumEVMetadata() {
static bool
SystemSupportsOCSP() {
-#if defined(OS_WIN)
+#if defined(USE_OPENSSL)
+ // http://crbug.com/117478 - OpenSSL does not support OCSP.
+ return false;
+#elif defined(OS_WIN)
return base::win::GetVersion() >= base::win::VERSION_VISTA;
#elif defined(OS_ANDROID)
// TODO(jnd): http://crbug.com/117478 - EV verification is not yet supported.