| 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/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 empty_cert_list_, | 133 empty_cert_list_, |
| 134 &verify_result)); | 134 &verify_result)); |
| 135 } | 135 } |
| 136 | 136 |
| 137 #if defined(OS_ANDROID) || defined(USE_OPENSSL) | 137 #if defined(OS_ANDROID) || defined(USE_OPENSSL) |
| 138 // TODO(jnd): http://crbug.com/117478 - EV verification is not yet supported. | 138 // TODO(jnd): http://crbug.com/117478 - EV verification is not yet supported. |
| 139 #define MAYBE_EVVerification DISABLED_EVVerification | 139 #define MAYBE_EVVerification DISABLED_EVVerification |
| 140 #else | 140 #else |
| 141 #define MAYBE_EVVerification EVVerification | 141 #define MAYBE_EVVerification EVVerification |
| 142 #endif | 142 #endif |
| 143 TEST_F(CertVerifyProcTest, MAYBE_EVVerification) { | 143 TEST_F(CertVerifyProcTest, DISABLED_EVVerification) { |
| 144 // This certificate will expire Jun 21, 2013. | 144 // DISABLED: This certificate expired Jun 21, 2013. |
| 145 CertificateList certs = CreateCertificateListFromFile( | 145 CertificateList certs = CreateCertificateListFromFile( |
| 146 GetTestCertsDirectory(), | 146 GetTestCertsDirectory(), |
| 147 "comodo.chain.pem", | 147 "comodo.chain.pem", |
| 148 X509Certificate::FORMAT_PEM_CERT_SEQUENCE); | 148 X509Certificate::FORMAT_PEM_CERT_SEQUENCE); |
| 149 ASSERT_EQ(3U, certs.size()); | 149 ASSERT_EQ(3U, certs.size()); |
| 150 | 150 |
| 151 X509Certificate::OSCertHandles intermediates; | 151 X509Certificate::OSCertHandles intermediates; |
| 152 intermediates.push_back(certs[1]->os_cert_handle()); | 152 intermediates.push_back(certs[1]->os_cert_handle()); |
| 153 intermediates.push_back(certs[2]->os_cert_handle()); | 153 intermediates.push_back(certs[2]->os_cert_handle()); |
| 154 | 154 |
| (...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1394 TEST_P(CertVerifyProcNonUniqueNameTest, IsHostnameNonUnique) { | 1394 TEST_P(CertVerifyProcNonUniqueNameTest, IsHostnameNonUnique) { |
| 1395 const NonUniqueNameTestData& test_data = GetParam(); | 1395 const NonUniqueNameTestData& test_data = GetParam(); |
| 1396 | 1396 |
| 1397 EXPECT_EQ(test_data.is_unique, IsUnique(test_data.hostname)); | 1397 EXPECT_EQ(test_data.is_unique, IsUnique(test_data.hostname)); |
| 1398 } | 1398 } |
| 1399 | 1399 |
| 1400 INSTANTIATE_TEST_CASE_P(, CertVerifyProcNonUniqueNameTest, | 1400 INSTANTIATE_TEST_CASE_P(, CertVerifyProcNonUniqueNameTest, |
| 1401 testing::ValuesIn(kNonUniqueNameTestData)); | 1401 testing::ValuesIn(kNonUniqueNameTestData)); |
| 1402 | 1402 |
| 1403 } // namespace net | 1403 } // namespace net |
| OLD | NEW |