net/cert/nss_profile_filter_chromeos_unittest.cc - Issue 137553004: NSS Cros multiprofile: trust roots added by a profile shouldn't apply to other profiles.

Unified Diff: net/cert/nss_profile_filter_chromeos_unittest.cc

Issue 137553004: NSS Cros multiprofile: trust roots added by a profile shouldn't apply to other profiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: handle additional trust roots, add TestRootCertsTest.Contains, remove instantiated certtests from c… 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

Index: net/cert/nss_profile_filter_chromeos_unittest.cc

diff --git a/net/cert/nss_profile_filter_chromeos_unittest.cc b/net/cert/nss_profile_filter_chromeos_unittest.cc

index 8f3806186139fb97608dcd718cc9b9653e9b7558..0c3d24de737f33880af5989439897f9a3e06ca0d 100644

--- a/net/cert/nss_profile_filter_chromeos_unittest.cc

+++ b/net/cert/nss_profile_filter_chromeos_unittest.cc

@@ -99,11 +99,12 @@ class NSSProfileFilterChromeOSTest : public testing::Test {

NSSProfileFilterChromeOS profile_filter_2_;

};

-TEST_F(NSSProfileFilterChromeOSTest, TempCertAllowed) {

+TEST_F(NSSProfileFilterChromeOSTest, TempCertNotAllowed) {

EXPECT_EQ(NULL, certs_[0]->os_cert_handle()->slot);

- EXPECT_TRUE(no_slots_profile_filter_.IsCertAllowed(certs_[0]));

- EXPECT_TRUE(profile_filter_1_.IsCertAllowed(certs_[0]));

- EXPECT_TRUE(profile_filter_2_.IsCertAllowed(certs_[0]));

+ EXPECT_FALSE(

+ no_slots_profile_filter_.IsCertAllowed(certs_[0]->os_cert_handle()));

+ EXPECT_FALSE(profile_filter_1_.IsCertAllowed(certs_[0]->os_cert_handle()));

+ EXPECT_FALSE(profile_filter_2_.IsCertAllowed(certs_[0]->os_cert_handle()));

}

TEST_F(NSSProfileFilterChromeOSTest, InternalSlotAllowed) {

@@ -130,9 +131,10 @@ TEST_F(NSSProfileFilterChromeOSTest, RootCertsAllowed) {

CertificateList root_certs(ListCertsInSlot(root_certs_slot.get()));

ASSERT_FALSE(root_certs.empty());

- EXPECT_TRUE(no_slots_profile_filter_.IsCertAllowed(root_certs[0]));

- EXPECT_TRUE(profile_filter_1_.IsCertAllowed(root_certs[0]));

- EXPECT_TRUE(profile_filter_2_.IsCertAllowed(root_certs[0]));

+ EXPECT_TRUE(

+ no_slots_profile_filter_.IsCertAllowed(root_certs[0]->os_cert_handle()));

+ EXPECT_TRUE(profile_filter_1_.IsCertAllowed(root_certs[0]->os_cert_handle()));

+ EXPECT_TRUE(profile_filter_2_.IsCertAllowed(root_certs[0]->os_cert_handle()));

}

TEST_F(NSSProfileFilterChromeOSTest, SoftwareSlots) {

@@ -163,14 +165,16 @@ TEST_F(NSSProfileFilterChromeOSTest, SoftwareSlots) {

"cert2",

PR_FALSE /* includeTrust (unused) */));

- EXPECT_FALSE(no_slots_profile_filter_.IsCertAllowed(cert_1));

- EXPECT_FALSE(no_slots_profile_filter_.IsCertAllowed(cert_2));

+ EXPECT_FALSE(

+ no_slots_profile_filter_.IsCertAllowed(cert_1->os_cert_handle()));

+ EXPECT_FALSE(

+ no_slots_profile_filter_.IsCertAllowed(cert_2->os_cert_handle()));

- EXPECT_TRUE(profile_filter_1_.IsCertAllowed(cert_1));

- EXPECT_FALSE(profile_filter_1_.IsCertAllowed(cert_2));

+ EXPECT_TRUE(profile_filter_1_.IsCertAllowed(cert_1->os_cert_handle()));

+ EXPECT_FALSE(profile_filter_1_.IsCertAllowed(cert_2->os_cert_handle()));

- EXPECT_FALSE(profile_filter_2_.IsCertAllowed(cert_1));

- EXPECT_TRUE(profile_filter_2_.IsCertAllowed(cert_2));

+ EXPECT_FALSE(profile_filter_2_.IsCertAllowed(cert_1->os_cert_handle()));

+ EXPECT_TRUE(profile_filter_2_.IsCertAllowed(cert_2->os_cert_handle()));

}

} // namespace net

« net/cert/cert_verify_proc_nss.h ('K') | « net/cert/nss_profile_filter_chromeos.cc ('k') | net/cert/test_root_certs.h » ('j') | net/cert/test_root_certs.h » ('J')