Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1417)

Unified Diff: chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc

Issue 1994353002: Update CertVerifier::Verify to use RequestParams instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@request_params
Patch Set: Rebased Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc
diff --git a/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc b/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc
index 1949bc903b957ded597b2b46263a63ed8d7902dd..f8e4116e10cde988d7bb559ec76cd49c101372d5 100644
--- a/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc
+++ b/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc
@@ -24,17 +24,14 @@ class PrivetV3ContextGetter::CertVerifier : public net::CertVerifier {
public:
CertVerifier() {}
- int Verify(net::X509Certificate* cert,
- const std::string& hostname,
- const std::string& ocsp_response,
- int flags,
+ int Verify(const net::CertVerifier::RequestParams& params,
net::CRLSet* crl_set,
net::CertVerifyResult* verify_result,
const net::CompletionCallback& callback,
std::unique_ptr<Request>* out_req,
const net::BoundNetLog& net_log) override {
verify_result->Reset();
- verify_result->verified_cert = cert;
+ verify_result->verified_cert = params.certificate();
// Because no trust anchor checking is being performed, don't indicate that
// it came from an OS-trusted root.
@@ -56,9 +53,10 @@ class PrivetV3ContextGetter::CertVerifier : public net::CertVerifier {
// container clean.
verify_result->public_key_hashes.clear();
- verify_result->cert_status = CheckFingerprint(cert, hostname)
- ? 0
- : net::CERT_STATUS_AUTHORITY_INVALID;
+ verify_result->cert_status =
+ CheckFingerprint(params.certificate(), params.hostname())
+ ? 0
+ : net::CERT_STATUS_AUTHORITY_INVALID;
return net::IsCertStatusError(verify_result->cert_status)
? net::MapCertStatusToNetError(verify_result->cert_status)
: net::OK;
@@ -70,7 +68,7 @@ class PrivetV3ContextGetter::CertVerifier : public net::CertVerifier {
}
private:
- bool CheckFingerprint(net::X509Certificate* cert,
+ bool CheckFingerprint(const scoped_refptr<net::X509Certificate>& cert,
const std::string& hostname) const {
auto it = fingerprints_.find(hostname);
if (it == fingerprints_.end())

Powered by Google App Engine
This is Rietveld 408576698