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/policy/policy_cert_verifier.h" | 5 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 ASSERT_EQ(net::ERR_IO_PENDING, error); | 169 ASSERT_EQ(net::ERR_IO_PENDING, error); |
170 EXPECT_TRUE(request_handle); | 170 EXPECT_TRUE(request_handle); |
171 error = callback.WaitForResult(); | 171 error = callback.WaitForResult(); |
172 EXPECT_EQ(net::OK, error); | 172 EXPECT_EQ(net::OK, error); |
173 | 173 |
174 // The additional trust anchors were not used, since the certificate is | 174 // The additional trust anchors were not used, since the certificate is |
175 // trusted from the database. | 175 // trusted from the database. |
176 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); | 176 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); |
177 } | 177 } |
178 | 178 |
179 TEST_F(PolicyCertVerifierTest, VerifyUsingAdditionalTrustAnchor) { | 179 // http://crbug.com/396497 |
| 180 TEST_F(PolicyCertVerifierTest, DISABLED_VerifyUsingAdditionalTrustAnchor) { |
180 ASSERT_TRUE(SupportsAdditionalTrustAnchors()); | 181 ASSERT_TRUE(SupportsAdditionalTrustAnchors()); |
181 | 182 |
182 // |test_server_cert_| is untrusted, so Verify() fails. | 183 // |test_server_cert_| is untrusted, so Verify() fails. |
183 { | 184 { |
184 net::CertVerifyResult verify_result; | 185 net::CertVerifyResult verify_result; |
185 net::TestCompletionCallback callback; | 186 net::TestCompletionCallback callback; |
186 net::CertVerifier::RequestHandle request_handle = NULL; | 187 net::CertVerifier::RequestHandle request_handle = NULL; |
187 int error = VerifyTestServerCert(callback, &verify_result, &request_handle); | 188 int error = VerifyTestServerCert(callback, &verify_result, &request_handle); |
188 ASSERT_EQ(net::ERR_IO_PENDING, error); | 189 ASSERT_EQ(net::ERR_IO_PENDING, error); |
189 EXPECT_TRUE(request_handle); | 190 EXPECT_TRUE(request_handle); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 int error = VerifyTestServerCert(callback, &verify_result, &request_handle); | 227 int error = VerifyTestServerCert(callback, &verify_result, &request_handle); |
227 // Note: this hits the cached result from the first Verify() in this test. | 228 // Note: this hits the cached result from the first Verify() in this test. |
228 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); | 229 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); |
229 } | 230 } |
230 // The additional trust anchors were reset, thus |cert_verifier_| should not | 231 // The additional trust anchors were reset, thus |cert_verifier_| should not |
231 // signal it's usage anymore. | 232 // signal it's usage anymore. |
232 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); | 233 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); |
233 } | 234 } |
234 | 235 |
235 } // namespace policy | 236 } // namespace policy |
OLD | NEW |