summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 17:24:00 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 17:24:00 +0000
commit6df343c3e8a4e51bf9c2be5604ac754aef472354 (patch)
tree476085377cd60209633942d9afc9d07acf5ee3e1 /net
parentd7361b0c16159529ec6aecaa4de09bea3659f636 (diff)
downloadchromium_src-6df343c3e8a4e51bf9c2be5604ac754aef472354.zip
chromium_src-6df343c3e8a4e51bf9c2be5604ac754aef472354.tar.gz
chromium_src-6df343c3e8a4e51bf9c2be5604ac754aef472354.tar.bz2
Turn off the X509Certificate::Verify call for non-Windows platforms
because it hits a DCHECK failure in nss_ocsp.cc on Linux. TBR=abarth,ukai BUG=24038 TEST=Debug build of net_unittests should not hit a DCHECK failure in nss_ocsp.cc during the X509CertificateTest.PaypalNullCertParsing test. Review URL: http://codereview.chromium.org/270005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/x509_certificate_unittest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc
index 6c2e54d..7eef2f4 100644
--- a/net/base/x509_certificate_unittest.cc
+++ b/net/base/x509_certificate_unittest.cc
@@ -676,6 +676,11 @@ TEST(X509CertificateTest, PaypalNullCertParsing) {
for (size_t i = 0; i < 20; ++i)
EXPECT_EQ(paypal_null_fingerprint[i], fingerprint.data[i]);
+#if defined(OS_WIN)
+ // TODO(wtc): The Linux try bots still have NSS 3.12.0. They need to be
+ // updated to NSS 3.12.3.1 or later. Also, nss_ocsp.cc asserts that the
+ // current thread is a worker thread in our thread pool and therefore has
+ // no message loop. That assertion is overly strict.
int flags = 0;
CertVerifyResult verify_result;
int error = paypal_null_cert->Verify("www.paypal.com", flags,
@@ -684,9 +689,6 @@ TEST(X509CertificateTest, PaypalNullCertParsing) {
// Either the system crypto library should correctly report a certificate
// name mismatch, or our certificate blacklist should cause us to report an
// invalid certificate.
-#if defined(OS_WIN)
- // TODO(wtc): The Linux try bots still have NSS 3.12.0. They need to be
- // updated to NSS 3.12.3.1 or later.
EXPECT_NE(0, verify_result.cert_status &
(CERT_STATUS_COMMON_NAME_INVALID | CERT_STATUS_INVALID));
#endif