OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 67 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
68 trust_anchors_ = trust_anchors; | 68 trust_anchors_ = trust_anchors; |
69 } | 69 } |
70 | 70 |
71 int PolicyCertVerifier::Verify( | 71 int PolicyCertVerifier::Verify( |
72 const RequestParams& params, | 72 const RequestParams& params, |
73 net::CRLSet* crl_set, | 73 net::CRLSet* crl_set, |
74 net::CertVerifyResult* verify_result, | 74 net::CertVerifyResult* verify_result, |
75 const net::CompletionCallback& completion_callback, | 75 const net::CompletionCallback& completion_callback, |
76 std::unique_ptr<Request>* out_req, | 76 std::unique_ptr<Request>* out_req, |
77 const net::BoundNetLog& net_log) { | 77 const net::NetLogWithSource& net_log) { |
78 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 78 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
79 DCHECK(delegate_); | 79 DCHECK(delegate_); |
80 net::CompletionCallback wrapped_callback = | 80 net::CompletionCallback wrapped_callback = |
81 base::Bind(&CompleteAndSignalAnchorUse, | 81 base::Bind(&CompleteAndSignalAnchorUse, |
82 anchor_used_callback_, | 82 anchor_used_callback_, |
83 completion_callback, | 83 completion_callback, |
84 verify_result); | 84 verify_result); |
85 | 85 |
86 net::CertificateList merged_trust_anchors(params.additional_trust_anchors()); | 86 net::CertificateList merged_trust_anchors(params.additional_trust_anchors()); |
87 merged_trust_anchors.insert(merged_trust_anchors.begin(), | 87 merged_trust_anchors.insert(merged_trust_anchors.begin(), |
88 trust_anchors_.begin(), trust_anchors_.end()); | 88 trust_anchors_.begin(), trust_anchors_.end()); |
89 net::CertVerifier::RequestParams new_params( | 89 net::CertVerifier::RequestParams new_params( |
90 params.certificate(), params.hostname(), params.flags(), | 90 params.certificate(), params.hostname(), params.flags(), |
91 params.ocsp_response(), merged_trust_anchors); | 91 params.ocsp_response(), merged_trust_anchors); |
92 int error = delegate_->Verify(new_params, crl_set, verify_result, | 92 int error = delegate_->Verify(new_params, crl_set, verify_result, |
93 wrapped_callback, out_req, net_log); | 93 wrapped_callback, out_req, net_log); |
94 MaybeSignalAnchorUse(error, anchor_used_callback_, *verify_result); | 94 MaybeSignalAnchorUse(error, anchor_used_callback_, *verify_result); |
95 return error; | 95 return error; |
96 } | 96 } |
97 | 97 |
98 bool PolicyCertVerifier::SupportsOCSPStapling() { | 98 bool PolicyCertVerifier::SupportsOCSPStapling() { |
99 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 99 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
100 return delegate_->SupportsOCSPStapling(); | 100 return delegate_->SupportsOCSPStapling(); |
101 } | 101 } |
102 | 102 |
103 } // namespace policy | 103 } // namespace policy |
OLD | NEW |