diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 12:00:53 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 12:00:53 +0000 |
| commit | 96df79cd5667f8904069539e7581e7cfb3be4330 (patch) | |
| tree | 4dde12b549b0f98faeaa6ae42537a8d7dfcbb4a5 /net | |
| parent | 7ef21104f84ce08eccd43614f0a5fa84da4878d6 (diff) | |
| download | chromium_src-96df79cd5667f8904069539e7581e7cfb3be4330.zip chromium_src-96df79cd5667f8904069539e7581e7cfb3be4330.tar.gz chromium_src-96df79cd5667f8904069539e7581e7cfb3be4330.tar.bz2 | |
Remove expired certificate from CertDatabaseNSSTest.ImportCACertHierarchyTree.
TBR=eroman@chromium.org
BUG=111029
TEST=CertDatabaseNSSTest.ImportCACertHierarchyTree
Review URL: https://chromiumcodereview.appspot.com/9200012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/cert_database_nss_unittest.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/base/cert_database_nss_unittest.cc b/net/base/cert_database_nss_unittest.cc index fee6677..d5a4092 100644 --- a/net/base/cert_database_nss_unittest.cc +++ b/net/base/cert_database_nss_unittest.cc @@ -474,7 +474,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyUntrusted) { TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyTree) { CertificateList certs; ASSERT_TRUE(ReadCertIntoList("dod_root_ca_2_cert.der", &certs)); - ASSERT_TRUE(ReadCertIntoList("dod_ca_13_cert.der", &certs)); + // This certificate is expired. http://crbug.com/111029 + // ASSERT_TRUE(ReadCertIntoList("dod_ca_13_cert.der", &certs)); ASSERT_TRUE(ReadCertIntoList("dod_ca_17_cert.der", &certs)); // Import it. @@ -486,10 +487,14 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyTree) { EXPECT_EQ(0U, failed.size()); CertificateList cert_list = ListCertsInSlot(slot_->os_module_handle()); - ASSERT_EQ(3U, cert_list.size()); - EXPECT_EQ("DOD CA-13", cert_list[0]->subject().common_name); - EXPECT_EQ("DoD Root CA 2", cert_list[1]->subject().common_name); - EXPECT_EQ("DOD CA-17", cert_list[2]->subject().common_name); + // One of the certificates is expired. http://crbug.com/111029 + // ASSERT_EQ(3U, cert_list.size()); + // EXPECT_EQ("DOD CA-13", cert_list[0]->subject().common_name); + // EXPECT_EQ("DoD Root CA 2", cert_list[1]->subject().common_name); + // EXPECT_EQ("DOD CA-17", cert_list[2]->subject().common_name); + ASSERT_EQ(2U, cert_list.size()); + EXPECT_EQ("DoD Root CA 2", cert_list[0]->subject().common_name); + EXPECT_EQ("DOD CA-17", cert_list[1]->subject().common_name); } TEST_F(CertDatabaseNSSTest, ImportCACertNotHierarchy) { |