Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/cert/cert_verify_proc.h" | 5 #include "net/cert/cert_verify_proc.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 827 verify_result.verified_cert->GetIntermediateCertificates(); | 827 verify_result.verified_cert->GetIntermediateCertificates(); |
| 828 ASSERT_EQ(2U, return_intermediates.size()); | 828 ASSERT_EQ(2U, return_intermediates.size()); |
| 829 EXPECT_TRUE(X509Certificate::IsSameOSCert(return_intermediates[0], | 829 EXPECT_TRUE(X509Certificate::IsSameOSCert(return_intermediates[0], |
| 830 certs[1]->os_cert_handle())); | 830 certs[1]->os_cert_handle())); |
| 831 EXPECT_TRUE(X509Certificate::IsSameOSCert(return_intermediates[1], | 831 EXPECT_TRUE(X509Certificate::IsSameOSCert(return_intermediates[1], |
| 832 certs[2]->os_cert_handle())); | 832 certs[2]->os_cert_handle())); |
| 833 } | 833 } |
| 834 | 834 |
| 835 TEST_F(CertVerifyProcTest, AdditionalTrustAnchors) { | 835 TEST_F(CertVerifyProcTest, AdditionalTrustAnchors) { |
| 836 if (!SupportsAdditionalTrustAnchors()) { | 836 if (!SupportsAdditionalTrustAnchors()) { |
| 837 LOG(INFO) << "Skipping this test in this platform."; | 837 VLOG(0) << "Skipping this test in this platform."; |
|
Ryan Sleevi
2013/11/25 01:08:32
Keep this as LOG(INFO)
scottmg
2013/11/25 17:12:38
Done.
| |
| 838 return; | 838 return; |
| 839 } | 839 } |
| 840 | 840 |
| 841 // |ca_cert| is the issuer of |cert|. | 841 // |ca_cert| is the issuer of |cert|. |
| 842 CertificateList ca_cert_list = CreateCertificateListFromFile( | 842 CertificateList ca_cert_list = CreateCertificateListFromFile( |
| 843 GetTestCertsDirectory(), "root_ca_cert.pem", | 843 GetTestCertsDirectory(), "root_ca_cert.pem", |
| 844 X509Certificate::FORMAT_AUTO); | 844 X509Certificate::FORMAT_AUTO); |
| 845 ASSERT_EQ(1U, ca_cert_list.size()); | 845 ASSERT_EQ(1U, ca_cert_list.size()); |
| 846 scoped_refptr<X509Certificate> ca_cert(ca_cert_list[0]); | 846 scoped_refptr<X509Certificate> ca_cert(ca_cert_list[0]); |
| 847 | 847 |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1423 EXPECT_TRUE(verify_result.cert_status & CERT_STATUS_COMMON_NAME_INVALID); | 1423 EXPECT_TRUE(verify_result.cert_status & CERT_STATUS_COMMON_NAME_INVALID); |
| 1424 } | 1424 } |
| 1425 } | 1425 } |
| 1426 | 1426 |
| 1427 WRAPPED_INSTANTIATE_TEST_CASE_P( | 1427 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 1428 VerifyName, | 1428 VerifyName, |
| 1429 CertVerifyProcNameTest, | 1429 CertVerifyProcNameTest, |
| 1430 testing::ValuesIn(kVerifyNameData)); | 1430 testing::ValuesIn(kVerifyNameData)); |
| 1431 | 1431 |
| 1432 } // namespace net | 1432 } // namespace net |
| OLD | NEW |