diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 22:37:57 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 22:37:57 +0000 |
| commit | 9fdc6d91c7a7f33ed1b7baeb2114440b0b4d2d7b (patch) | |
| tree | 9242c581abfa6d9d2ea94e4f3253d8dd73f029bd /net | |
| parent | 9237799897675d722d4b86a4805c59d0cd557f0c (diff) | |
| download | chromium_src-9fdc6d91c7a7f33ed1b7baeb2114440b0b4d2d7b.zip chromium_src-9fdc6d91c7a7f33ed1b7baeb2114440b0b4d2d7b.tar.gz chromium_src-9fdc6d91c7a7f33ed1b7baeb2114440b0b4d2d7b.tar.bz2 | |
Remove obsolete NSS version checks.
BUG=none
Review URL: https://codereview.chromium.org/141503002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/cert/cert_verify_proc_nss.cc | 16 | ||||
| -rw-r--r-- | net/cert/nss_cert_database_unittest.cc | 25 |
2 files changed, 2 insertions, 39 deletions
diff --git a/net/cert/cert_verify_proc_nss.cc b/net/cert/cert_verify_proc_nss.cc index c401eba..e488882 100644 --- a/net/cert/cert_verify_proc_nss.cc +++ b/net/cert/cert_verify_proc_nss.cc @@ -33,17 +33,6 @@ #include "net/cert/x509_util_ios.h" #endif // defined(OS_IOS) -#define NSS_VERSION_NUM (NSS_VMAJOR * 10000 + NSS_VMINOR * 100 + NSS_VPATCH) -#if NSS_VERSION_NUM < 31305 -// Added in NSS 3.13.5. -#define SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED -8016 -#endif - -#if NSS_VERSION_NUM < 31402 -// Added in NSS 3.14.2. -#define cert_pi_useOnlyTrustAnchors static_cast<CERTValParamInType>(14) -#endif - namespace net { namespace { @@ -744,8 +733,7 @@ CertVerifyProcNSS::CertVerifyProcNSS() {} CertVerifyProcNSS::~CertVerifyProcNSS() {} bool CertVerifyProcNSS::SupportsAdditionalTrustAnchors() const { - // This requires APIs introduced in 3.14.2. - return NSS_VersionCheck("3.14.2"); + return true; } int CertVerifyProcNSS::VerifyInternal( @@ -801,7 +789,7 @@ int CertVerifyProcNSS::VerifyInternal( verify_result->cert_status |= CERT_STATUS_REV_CHECKING_ENABLED; ScopedCERTCertList trust_anchors; - if (SupportsAdditionalTrustAnchors() && !additional_trust_anchors.empty()) { + if (!additional_trust_anchors.empty()) { trust_anchors.reset( CertificateListToCERTCertList(additional_trust_anchors)); } diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc index f6958cf..39e1a33 100644 --- a/net/cert/nss_cert_database_unittest.cc +++ b/net/cert/nss_cert_database_unittest.cc @@ -591,13 +591,6 @@ TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned) { } TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned_Trusted) { - // When using CERT_PKIXVerifyCert (which we do), server trust only works from - // 3.13.4 onwards. See https://bugzilla.mozilla.org/show_bug.cgi?id=647364. - if (!NSS_VersionCheck("3.13.4")) { - LOG(INFO) << "test skipped on NSS < 3.13.4"; - return; - } - CertificateList certs; ASSERT_TRUE(ReadCertIntoList("punycodetest.der", &certs)); @@ -666,12 +659,6 @@ TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert) { } TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert_DistrustServer) { - // Explicit distrust only works starting in NSS 3.13. - if (!NSS_VersionCheck("3.13")) { - LOG(INFO) << "test skipped on NSS < 3.13"; - return; - } - CertificateList ca_certs = CreateCertificateListFromFile( GetTestCertsDirectory(), "root_ca_cert.pem", X509Certificate::FORMAT_AUTO); @@ -760,12 +747,6 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa) { EXPECT_EQ(OK, error); EXPECT_EQ(0U, verify_result.cert_status); - // Explicit distrust only works starting in NSS 3.13. - if (!NSS_VersionCheck("3.13")) { - LOG(INFO) << "test partially skipped on NSS < 3.13"; - return; - } - // Trust the root cert and distrust the intermediate. EXPECT_TRUE(cert_db_->SetCertTrust( ca_certs[0].get(), CA_CERT, NSSCertDatabase::TRUSTED_SSL)); @@ -929,12 +910,6 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa3) { } TEST_F(CertDatabaseNSSTest, TrustIntermediateCa4) { - // Explicit distrust only works starting in NSS 3.13. - if (!NSS_VersionCheck("3.13")) { - LOG(INFO) << "test skipped on NSS < 3.13"; - return; - } - NSSCertDatabase::ImportCertFailureList failed; CertificateList ca_certs = CreateCertificateListFromFile( |