| Index: net/base/cert_database_nss_unittest.cc
|
| diff --git a/net/base/cert_database_nss_unittest.cc b/net/base/cert_database_nss_unittest.cc
|
| index 5056e5dfbfdac1d57476b46c94c9786de268e00f..dd8cc3d46da47e1b0d4ab50d4edf85d1bf1865b5 100644
|
| --- a/net/base/cert_database_nss_unittest.cc
|
| +++ b/net/base/cert_database_nss_unittest.cc
|
| @@ -180,7 +180,7 @@ TEST_F(CertDatabaseNSSTest, ImportFromPKCS12AndExportAgain) {
|
| }
|
|
|
| TEST_F(CertDatabaseNSSTest, ImportCACert_SSLTrust) {
|
| - std::string cert_data = ReadTestFile("root_ca_cert.crt");
|
| + std::string cert_data = ReadTestFile("root_ca_cert.pem");
|
|
|
| CertificateList certs =
|
| X509Certificate::CreateCertificateListFromBytes(
|
| @@ -198,7 +198,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_SSLTrust) {
|
| CertificateList cert_list = ListCertsInSlot(slot_.get());
|
| ASSERT_EQ(1U, cert_list.size());
|
| scoped_refptr<X509Certificate> cert(cert_list[0]);
|
| - EXPECT_EQ("Test CA", cert->subject().common_name);
|
| + EXPECT_EQ("Test Root CA", cert->subject().common_name);
|
|
|
| EXPECT_EQ(CertDatabase::TRUSTED_SSL,
|
| cert_db_.GetCertTrust(cert.get(), CA_CERT));
|
| @@ -212,7 +212,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_SSLTrust) {
|
| }
|
|
|
| TEST_F(CertDatabaseNSSTest, ImportCACert_EmailTrust) {
|
| - std::string cert_data = ReadTestFile("root_ca_cert.crt");
|
| + std::string cert_data = ReadTestFile("root_ca_cert.pem");
|
|
|
| CertificateList certs =
|
| X509Certificate::CreateCertificateListFromBytes(
|
| @@ -230,7 +230,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_EmailTrust) {
|
| CertificateList cert_list = ListCertsInSlot(slot_.get());
|
| ASSERT_EQ(1U, cert_list.size());
|
| scoped_refptr<X509Certificate> cert(cert_list[0]);
|
| - EXPECT_EQ("Test CA", cert->subject().common_name);
|
| + EXPECT_EQ("Test Root CA", cert->subject().common_name);
|
|
|
| EXPECT_EQ(CertDatabase::TRUSTED_EMAIL,
|
| cert_db_.GetCertTrust(cert.get(), CA_CERT));
|
| @@ -243,7 +243,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_EmailTrust) {
|
| }
|
|
|
| TEST_F(CertDatabaseNSSTest, ImportCACert_ObjSignTrust) {
|
| - std::string cert_data = ReadTestFile("root_ca_cert.crt");
|
| + std::string cert_data = ReadTestFile("root_ca_cert.pem");
|
|
|
| CertificateList certs =
|
| X509Certificate::CreateCertificateListFromBytes(
|
| @@ -261,7 +261,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_ObjSignTrust) {
|
| CertificateList cert_list = ListCertsInSlot(slot_.get());
|
| ASSERT_EQ(1U, cert_list.size());
|
| scoped_refptr<X509Certificate> cert(cert_list[0]);
|
| - EXPECT_EQ("Test CA", cert->subject().common_name);
|
| + EXPECT_EQ("Test Root CA", cert->subject().common_name);
|
|
|
| EXPECT_EQ(CertDatabase::TRUSTED_OBJ_SIGN,
|
| cert_db_.GetCertTrust(cert.get(), CA_CERT));
|
| @@ -402,7 +402,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyTree) {
|
| }
|
|
|
| TEST_F(CertDatabaseNSSTest, ImportCACertNotHierarchy) {
|
| - std::string cert_data = ReadTestFile("root_ca_cert.crt");
|
| + std::string cert_data = ReadTestFile("root_ca_cert.pem");
|
| CertificateList certs =
|
| X509Certificate::CreateCertificateListFromBytes(
|
| cert_data.data(), cert_data.size(), X509Certificate::FORMAT_AUTO);
|
| @@ -426,7 +426,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertNotHierarchy) {
|
|
|
| CertificateList cert_list = ListCertsInSlot(slot_.get());
|
| ASSERT_EQ(1U, cert_list.size());
|
| - EXPECT_EQ("Test CA", cert_list[0]->subject().common_name);
|
| + EXPECT_EQ("Test Root CA", cert_list[0]->subject().common_name);
|
| }
|
|
|
| TEST_F(CertDatabaseNSSTest, ImportServerCert) {
|
|
|