| Index: net/cert/multi_threaded_cert_verifier_unittest.cc
|
| diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
|
| index 3a0c765d2120969e1fb08b7ed808dc0cfe1953ae..8a95e41c813c9709647b6dae8aa23e3a2bae5fb1 100644
|
| --- a/net/cert/multi_threaded_cert_verifier_unittest.cc
|
| +++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
|
| @@ -39,9 +39,7 @@ class MockCertVerifyProc : public CertVerifyProc {
|
| virtual ~MockCertVerifyProc() {}
|
|
|
| // CertVerifyProc implementation
|
| - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE {
|
| - return false;
|
| - }
|
| + virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE { return false; }
|
|
|
| virtual int VerifyInternal(X509Certificate* cert,
|
| const std::string& hostname,
|
| @@ -333,56 +331,56 @@ TEST_F(MultiThreadedCertVerifierTest, RequestParamsComparators) {
|
| // 1 means key1 is greater than key2
|
| int expected_result;
|
| } tests[] = {
|
| - { // Test for basic equivalence.
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - 0, test_list),
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - 0, test_list),
|
| - 0,
|
| - },
|
| - { // Test that different certificates but with the same CA and for
|
| - // the same host are different validation keys.
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - 0, test_list),
|
| - MultiThreadedCertVerifier::RequestParams(z_key, a_key, "www.example.test",
|
| - 0, test_list),
|
| - -1,
|
| - },
|
| - { // Test that the same EE certificate for the same host, but with
|
| - // different chains are different validation keys.
|
| - MultiThreadedCertVerifier::RequestParams(a_key, z_key, "www.example.test",
|
| - 0, test_list),
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - 0, test_list),
|
| - 1,
|
| - },
|
| - { // The same certificate, with the same chain, but for different
|
| - // hosts are different validation keys.
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key,
|
| - "www1.example.test", 0,
|
| - test_list),
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key,
|
| - "www2.example.test", 0,
|
| - test_list),
|
| - -1,
|
| - },
|
| - { // The same certificate, chain, and host, but with different flags
|
| - // are different validation keys.
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - CertVerifier::VERIFY_EV_CERT,
|
| - test_list),
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - 0, test_list),
|
| - 1,
|
| - },
|
| - { // Different additional_trust_anchors.
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - 0, empty_list),
|
| - MultiThreadedCertVerifier::RequestParams(a_key, a_key, "www.example.test",
|
| - 0, test_list),
|
| - -1,
|
| - },
|
| - };
|
| + {// Test for basic equivalence.
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www.example.test", 0, test_list),
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www.example.test", 0, test_list),
|
| + 0,
|
| + },
|
| + {// Test that different certificates but with the same CA and for
|
| + // the same host are different validation keys.
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www.example.test", 0, test_list),
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + z_key, a_key, "www.example.test", 0, test_list),
|
| + -1,
|
| + },
|
| + {// Test that the same EE certificate for the same host, but with
|
| + // different chains are different validation keys.
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, z_key, "www.example.test", 0, test_list),
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www.example.test", 0, test_list),
|
| + 1,
|
| + },
|
| + {// The same certificate, with the same chain, but for different
|
| + // hosts are different validation keys.
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www1.example.test", 0, test_list),
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www2.example.test", 0, test_list),
|
| + -1,
|
| + },
|
| + {// The same certificate, chain, and host, but with different flags
|
| + // are different validation keys.
|
| + MultiThreadedCertVerifier::RequestParams(a_key,
|
| + a_key,
|
| + "www.example.test",
|
| + CertVerifier::VERIFY_EV_CERT,
|
| + test_list),
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www.example.test", 0, test_list),
|
| + 1,
|
| + },
|
| + {// Different additional_trust_anchors.
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www.example.test", 0, empty_list),
|
| + MultiThreadedCertVerifier::RequestParams(
|
| + a_key, a_key, "www.example.test", 0, test_list),
|
| + -1,
|
| + },
|
| + };
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
|
| SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]", i));
|
|
|
|
|