OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" | 5 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" |
6 | 6 |
7 #include "crypto/nss_util.h" | 7 #include "crypto/nss_util.h" |
8 #include "crypto/nss_util_internal.h" | 8 #include "crypto/nss_util_internal.h" |
9 #include "net/base/net_errors.h" | 9 #include "net/base/net_errors.h" |
10 #include "net/base/test_data_directory.h" | 10 #include "net/base/test_data_directory.h" |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 } | 279 } |
280 | 280 |
281 class CertVerifyProcChromeOSOrderingTest | 281 class CertVerifyProcChromeOSOrderingTest |
282 : public CertVerifyProcChromeOSTest, | 282 : public CertVerifyProcChromeOSTest, |
283 public ::testing::WithParamInterface< | 283 public ::testing::WithParamInterface< |
284 std::tr1::tuple<bool, int, std::string> > {}; | 284 std::tr1::tuple<bool, int, std::string> > {}; |
285 | 285 |
286 // Test a variety of different combinations of (maybe) verifying / (maybe) | 286 // Test a variety of different combinations of (maybe) verifying / (maybe) |
287 // importing / verifying again, to try to find any cases where caching might | 287 // importing / verifying again, to try to find any cases where caching might |
288 // affect the results. | 288 // affect the results. |
289 TEST_P(CertVerifyProcChromeOSOrderingTest, TrustThenVerify) { | 289 // http://crbug.com/396501 |
| 290 TEST_P(CertVerifyProcChromeOSOrderingTest, DISABLED_TrustThenVerify) { |
290 const ParamType& param = GetParam(); | 291 const ParamType& param = GetParam(); |
291 const bool verify_first = std::tr1::get<0>(param); | 292 const bool verify_first = std::tr1::get<0>(param); |
292 const int trust_bitmask = std::tr1::get<1>(param); | 293 const int trust_bitmask = std::tr1::get<1>(param); |
293 const std::string test_order = std::tr1::get<2>(param); | 294 const std::string test_order = std::tr1::get<2>(param); |
294 DVLOG(1) << "verify_first: " << verify_first | 295 DVLOG(1) << "verify_first: " << verify_first |
295 << " trust_bitmask: " << trust_bitmask | 296 << " trust_bitmask: " << trust_bitmask |
296 << " test_order: " << test_order; | 297 << " test_order: " << test_order; |
297 | 298 |
298 scoped_refptr<net::X509Certificate> server = certs_1_[0]; | 299 scoped_refptr<net::X509Certificate> server = certs_1_[0]; |
299 std::string verify_root; | 300 std::string verify_root; |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 | 373 |
373 INSTANTIATE_TEST_CASE_P( | 374 INSTANTIATE_TEST_CASE_P( |
374 Variations, | 375 Variations, |
375 CertVerifyProcChromeOSOrderingTest, | 376 CertVerifyProcChromeOSOrderingTest, |
376 ::testing::Combine( | 377 ::testing::Combine( |
377 ::testing::Bool(), | 378 ::testing::Bool(), |
378 ::testing::Range(0, 1 << 2), | 379 ::testing::Range(0, 1 << 2), |
379 ::testing::Values("d12", "d21", "1d2", "12d", "2d1", "21d"))); | 380 ::testing::Values("d12", "d21", "1d2", "12d", "2d1", "21d"))); |
380 | 381 |
381 } // namespace chromeos | 382 } // namespace chromeos |
OLD | NEW |