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 342e0b9701ab26d59c44ae81a74fd2ba72539e82..23e759023dc294efb6026163ab996b157af32401 100644 |
--- a/net/cert/nss_cert_database_unittest.cc |
+++ b/net/cert/nss_cert_database_unittest.cc |
@@ -193,13 +193,13 @@ TEST_F(CertDatabaseNSSTest, ImportFromPKCS12AsExtractableAndExportAgain) { |
ASSERT_EQ(1U, cert_list.size()); |
scoped_refptr<X509Certificate> cert(cert_list[0]); |
- EXPECT_EQ("testusercert", |
- cert->subject().common_name); |
+ EXPECT_EQ("testusercert", cert->subject().common_name); |
// TODO(mattm): move export test to separate test case? |
std::string exported_data; |
- EXPECT_EQ(1, cert_db_->ExportToPKCS12(cert_list, ASCIIToUTF16("exportpw"), |
- &exported_data)); |
+ EXPECT_EQ(1, |
+ cert_db_->ExportToPKCS12( |
+ cert_list, ASCIIToUTF16("exportpw"), &exported_data)); |
ASSERT_LT(0U, exported_data.size()); |
// TODO(mattm): further verification of exported data? |
} |
@@ -240,12 +240,12 @@ TEST_F(CertDatabaseNSSTest, ImportFromPKCS12AsUnextractableAndExportAgain) { |
ASSERT_EQ(1U, cert_list.size()); |
scoped_refptr<X509Certificate> cert(cert_list[0]); |
- EXPECT_EQ("testusercert", |
- cert->subject().common_name); |
+ EXPECT_EQ("testusercert", cert->subject().common_name); |
std::string exported_data; |
- EXPECT_EQ(0, cert_db_->ExportToPKCS12(cert_list, ASCIIToUTF16("exportpw"), |
- &exported_data)); |
+ EXPECT_EQ(0, |
+ cert_db_->ExportToPKCS12( |
+ cert_list, ASCIIToUTF16("exportpw"), &exported_data)); |
} |
// Importing a PKCS#12 file with a certificate but no corresponding |
@@ -276,8 +276,9 @@ TEST_F(CertDatabaseNSSTest, ImportFromPKCS12OnlyMarkIncludedKey) { |
// Make sure the imported private key is still extractable. |
std::string exported_data; |
- EXPECT_EQ(1, cert_db_->ExportToPKCS12(cert_list, ASCIIToUTF16("exportpw"), |
- &exported_data)); |
+ EXPECT_EQ(1, |
+ cert_db_->ExportToPKCS12( |
+ cert_list, ASCIIToUTF16("exportpw"), &exported_data)); |
ASSERT_LT(0U, exported_data.size()); |
} |
@@ -296,16 +297,17 @@ TEST_F(CertDatabaseNSSTest, ImportFromPKCS12InvalidFile) { |
} |
TEST_F(CertDatabaseNSSTest, ImportCACert_SSLTrust) { |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "root_ca_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "root_ca_cert.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
EXPECT_FALSE(certs[0]->os_cert_handle()->isperm); |
// Import it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUSTED_SSL, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
@@ -317,9 +319,9 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_SSLTrust) { |
EXPECT_EQ(NSSCertDatabase::TRUSTED_SSL, |
cert_db_->GetCertTrust(cert.get(), CA_CERT)); |
- EXPECT_EQ(unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | |
- CERTDB_TRUSTED_CLIENT_CA), |
- cert->os_cert_handle()->trust->sslFlags); |
+ EXPECT_EQ( |
+ unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA), |
+ cert->os_cert_handle()->trust->sslFlags); |
EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
cert->os_cert_handle()->trust->emailFlags); |
EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
@@ -327,16 +329,17 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_SSLTrust) { |
} |
TEST_F(CertDatabaseNSSTest, ImportCACert_EmailTrust) { |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "root_ca_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "root_ca_cert.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
EXPECT_FALSE(certs[0]->os_cert_handle()->isperm); |
// Import it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUSTED_EMAIL, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUSTED_EMAIL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
@@ -348,26 +351,26 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_EmailTrust) { |
EXPECT_EQ(NSSCertDatabase::TRUSTED_EMAIL, |
cert_db_->GetCertTrust(cert.get(), CA_CERT)); |
- EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
- cert->os_cert_handle()->trust->sslFlags); |
- EXPECT_EQ(unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | |
- CERTDB_TRUSTED_CLIENT_CA), |
- cert->os_cert_handle()->trust->emailFlags); |
+ EXPECT_EQ(unsigned(CERTDB_VALID_CA), cert->os_cert_handle()->trust->sslFlags); |
+ EXPECT_EQ( |
+ unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA), |
+ cert->os_cert_handle()->trust->emailFlags); |
EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
cert->os_cert_handle()->trust->objectSigningFlags); |
} |
TEST_F(CertDatabaseNSSTest, ImportCACert_ObjSignTrust) { |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "root_ca_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "root_ca_cert.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
EXPECT_FALSE(certs[0]->os_cert_handle()->isperm); |
// Import it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUSTED_OBJ_SIGN, |
- &failed)); |
+ EXPECT_TRUE(cert_db_->ImportCACerts( |
+ certs, NSSCertDatabase::TRUSTED_OBJ_SIGN, &failed)); |
EXPECT_EQ(0U, failed.size()); |
@@ -379,26 +382,24 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_ObjSignTrust) { |
EXPECT_EQ(NSSCertDatabase::TRUSTED_OBJ_SIGN, |
cert_db_->GetCertTrust(cert.get(), CA_CERT)); |
- EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
- cert->os_cert_handle()->trust->sslFlags); |
+ EXPECT_EQ(unsigned(CERTDB_VALID_CA), cert->os_cert_handle()->trust->sslFlags); |
EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
cert->os_cert_handle()->trust->emailFlags); |
- EXPECT_EQ(unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | |
- CERTDB_TRUSTED_CLIENT_CA), |
- cert->os_cert_handle()->trust->objectSigningFlags); |
+ EXPECT_EQ( |
+ unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA), |
+ cert->os_cert_handle()->trust->objectSigningFlags); |
} |
TEST_F(CertDatabaseNSSTest, ImportCA_NotCACert) { |
CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "ok_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ GetTestCertsDirectory(), "ok_cert.pem", X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
EXPECT_FALSE(certs[0]->os_cert_handle()->isperm); |
// Import it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUSTED_SSL, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
ASSERT_EQ(1U, failed.size()); |
// Note: this compares pointers directly. It's okay in this case because |
// ImportCACerts returns the same pointers that were passed in. In the |
@@ -422,7 +423,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchy) { |
// http://mxr.mozilla.org/mozilla/source/security/nss/lib/certhigh/certvfy.c#752 |
// "XXX This choice of trustType seems arbitrary.") |
EXPECT_TRUE(cert_db_->ImportCACerts( |
- certs, NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
+ certs, |
+ NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
&failed)); |
ASSERT_EQ(2U, failed.size()); |
@@ -443,7 +445,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyDupeRoot) { |
// First import just the root. |
NSSCertDatabase::ImportCertFailureList failed; |
EXPECT_TRUE(cert_db_->ImportCACerts( |
- certs, NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
+ certs, |
+ NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
&failed)); |
EXPECT_EQ(0U, failed.size()); |
@@ -458,7 +461,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyDupeRoot) { |
// already present, we should still import the rest. |
failed.clear(); |
EXPECT_TRUE(cert_db_->ImportCACerts( |
- certs, NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
+ certs, |
+ NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
&failed)); |
ASSERT_EQ(3U, failed.size()); |
@@ -481,8 +485,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyUntrusted) { |
// Import it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUST_DEFAULT, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportCACerts(certs, NSSCertDatabase::TRUST_DEFAULT, &failed)); |
ASSERT_EQ(1U, failed.size()); |
EXPECT_EQ("DOD CA-17", failed[0].certificate->subject().common_name); |
@@ -504,7 +508,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyTree) { |
// Import it. |
NSSCertDatabase::ImportCertFailureList failed; |
EXPECT_TRUE(cert_db_->ImportCACerts( |
- certs, NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
+ certs, |
+ NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL, |
&failed)); |
EXPECT_EQ(2U, failed.size()); |
@@ -519,18 +524,21 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyTree) { |
} |
TEST_F(CertDatabaseNSSTest, ImportCACertNotHierarchy) { |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "root_ca_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "root_ca_cert.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
ASSERT_TRUE(ReadCertIntoList("dod_ca_13_cert.der", &certs)); |
ASSERT_TRUE(ReadCertIntoList("dod_ca_17_cert.der", &certs)); |
// Import it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts( |
- certs, NSSCertDatabase::TRUSTED_SSL | NSSCertDatabase::TRUSTED_EMAIL | |
- NSSCertDatabase::TRUSTED_OBJ_SIGN, &failed)); |
+ EXPECT_TRUE(cert_db_->ImportCACerts(certs, |
+ NSSCertDatabase::TRUSTED_SSL | |
+ NSSCertDatabase::TRUSTED_EMAIL | |
+ NSSCertDatabase::TRUSTED_OBJ_SIGN, |
+ &failed)); |
ASSERT_EQ(2U, failed.size()); |
// TODO(mattm): should check for net error equivalent of |
@@ -551,14 +559,15 @@ TEST_F(CertDatabaseNSSTest, DISABLED_ImportServerCert) { |
// Need to import intermediate cert for the verify of google cert, otherwise |
// it will try to fetch it automatically with cert_pi_useAIACertFetch, which |
// will cause OCSPCreateSession on the main thread, which is not allowed. |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "google.chain.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "google.chain.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(2U, certs.size()); |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUST_DEFAULT, |
- &failed)); |
+ EXPECT_TRUE(cert_db_->ImportServerCert( |
+ certs, NSSCertDatabase::TRUST_DEFAULT, &failed)); |
EXPECT_EQ(0U, failed.size()); |
@@ -592,8 +601,8 @@ TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned) { |
ASSERT_TRUE(ReadCertIntoList("punycodetest.der", &certs)); |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUST_DEFAULT, |
- &failed)); |
+ EXPECT_TRUE(cert_db_->ImportServerCert( |
+ certs, NSSCertDatabase::TRUST_DEFAULT, &failed)); |
EXPECT_EQ(0U, failed.size()); |
@@ -623,8 +632,8 @@ TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned_Trusted) { |
ASSERT_TRUE(ReadCertIntoList("punycodetest.der", &certs)); |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUSTED_SSL, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
@@ -651,25 +660,25 @@ TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned_Trusted) { |
} |
TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert) { |
- CertificateList ca_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "root_ca_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList ca_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "root_ca_cert.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, ca_certs.size()); |
// Import CA cert and trust it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::TRUSTED_SSL, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "ok_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ GetTestCertsDirectory(), "ok_cert.pem", X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
// Import server cert with default trust. |
- EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUST_DEFAULT, |
- &failed)); |
+ EXPECT_TRUE(cert_db_->ImportServerCert( |
+ certs, NSSCertDatabase::TRUST_DEFAULT, &failed)); |
EXPECT_EQ(0U, failed.size()); |
// Server cert should verify. |
@@ -687,20 +696,20 @@ TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert) { |
} |
TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert_DistrustServer) { |
- CertificateList ca_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "root_ca_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList ca_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "root_ca_cert.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, ca_certs.size()); |
// Import CA cert and trust it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::TRUSTED_SSL, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "ok_cert.pem", |
- X509Certificate::FORMAT_AUTO); |
+ GetTestCertsDirectory(), "ok_cert.pem", X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
// Import server cert without inheriting trust from issuer (explicit |
@@ -729,30 +738,33 @@ TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert_DistrustServer) { |
} |
TEST_F(CertDatabaseNSSTest, TrustIntermediateCa) { |
- CertificateList ca_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-root.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList ca_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-root.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, ca_certs.size()); |
// Import Root CA cert and distrust it. |
NSSCertDatabase::ImportCertFailureList failed; |
- EXPECT_TRUE(cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::DISTRUSTED_SSL, |
- &failed)); |
+ EXPECT_TRUE(cert_db_->ImportCACerts( |
+ ca_certs, NSSCertDatabase::DISTRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
- CertificateList intermediate_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList intermediate_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, intermediate_certs.size()); |
// Import Intermediate CA cert and trust it. |
- EXPECT_TRUE(cert_db_->ImportCACerts(intermediate_certs, |
- NSSCertDatabase::TRUSTED_SSL, &failed)); |
+ EXPECT_TRUE(cert_db_->ImportCACerts( |
+ intermediate_certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
// Import server cert with default trust. |
@@ -791,9 +803,8 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa) { |
intermediate_certs[0]->os_cert_handle()->trust->sslFlags); |
EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
intermediate_certs[0]->os_cert_handle()->trust->emailFlags); |
- EXPECT_EQ( |
- unsigned(CERTDB_VALID_CA), |
- intermediate_certs[0]->os_cert_handle()->trust->objectSigningFlags); |
+ EXPECT_EQ(unsigned(CERTDB_VALID_CA), |
+ intermediate_certs[0]->os_cert_handle()->trust->objectSigningFlags); |
// Server cert should fail to verify. |
CertVerifyResult verify_result2; |
@@ -816,19 +827,21 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa2) { |
NSSCertDatabase::ImportCertFailureList failed; |
- CertificateList intermediate_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList intermediate_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, intermediate_certs.size()); |
// Import Intermediate CA cert and trust it. |
- EXPECT_TRUE(cert_db_->ImportCACerts(intermediate_certs, |
- NSSCertDatabase::TRUSTED_SSL, &failed)); |
+ EXPECT_TRUE(cert_db_->ImportCACerts( |
+ intermediate_certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
// Import server cert with default trust. |
@@ -876,29 +889,32 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa3) { |
NSSCertDatabase::ImportCertFailureList failed; |
- CertificateList ca_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-root.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList ca_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-root.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, ca_certs.size()); |
// Import Root CA cert and default trust it. |
- EXPECT_TRUE(cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::TRUST_DEFAULT, |
- &failed)); |
+ EXPECT_TRUE(cert_db_->ImportCACerts( |
+ ca_certs, NSSCertDatabase::TRUST_DEFAULT, &failed)); |
EXPECT_EQ(0U, failed.size()); |
- CertificateList intermediate_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList intermediate_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, intermediate_certs.size()); |
// Import Intermediate CA cert and trust it. |
- EXPECT_TRUE(cert_db_->ImportCACerts(intermediate_certs, |
- NSSCertDatabase::TRUSTED_SSL, &failed)); |
+ EXPECT_TRUE(cert_db_->ImportCACerts( |
+ intermediate_certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
// Import server cert with default trust. |
@@ -940,29 +956,32 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa3) { |
TEST_F(CertDatabaseNSSTest, TrustIntermediateCa4) { |
NSSCertDatabase::ImportCertFailureList failed; |
- CertificateList ca_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-root.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList ca_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-root.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, ca_certs.size()); |
// Import Root CA cert and trust it. |
- EXPECT_TRUE(cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::TRUSTED_SSL, |
- &failed)); |
+ EXPECT_TRUE( |
+ cert_db_->ImportCACerts(ca_certs, NSSCertDatabase::TRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
- CertificateList intermediate_certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList intermediate_certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, intermediate_certs.size()); |
// Import Intermediate CA cert and distrust it. |
EXPECT_TRUE(cert_db_->ImportCACerts( |
- intermediate_certs, NSSCertDatabase::DISTRUSTED_SSL, &failed)); |
+ intermediate_certs, NSSCertDatabase::DISTRUSTED_SSL, &failed)); |
EXPECT_EQ(0U, failed.size()); |
- CertificateList certs = CreateCertificateListFromFile( |
- GetTestCertsDirectory(), "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
- X509Certificate::FORMAT_AUTO); |
+ CertificateList certs = |
+ CreateCertificateListFromFile(GetTestCertsDirectory(), |
+ "2048-rsa-ee-by-2048-rsa-intermediate.pem", |
+ X509Certificate::FORMAT_AUTO); |
ASSERT_EQ(1U, certs.size()); |
// Import server cert with default trust. |