Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1423)

Unified Diff: net/cert/nss_cert_database_unittest.cc

Issue 141503002: Remove obsolete NSS version checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/cert/cert_verify_proc_nss.cc ('K') | « net/cert/cert_verify_proc_nss.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/nss_cert_database_unittest.cc
diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc
index f6958cf9875dda6880da9e3545b69847e53a5682..39e1a33a498225b41dd4e0d27ef49a2357ed4dfb 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(
« net/cert/cert_verify_proc_nss.cc ('K') | « net/cert/cert_verify_proc_nss.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698