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

Unified Diff: chrome/browser/io_thread.cc

Issue 1440643002: Certificate Transparency: Per-profile CT verification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing iOS compilation Created 5 years, 1 month 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
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 1f0d5f968cac8c98f32c1e198fc9a3b21f898815..eb727e9b2dfb999cc61c6c7f1661658058c6160a 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -689,7 +689,7 @@ void IOThread::Init() {
tracked_objects::ScopedTracker tracking_profile8(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466432 IOThread::InitAsync::CreateLogVerifiers::Start"));
- std::vector<scoped_refptr<net::CTLogVerifier>> ct_logs(
+ std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs(
net::ct::CreateLogVerifiersForKnownLogs());
// Add logs from command line
@@ -708,7 +708,7 @@ void IOThread::Init() {
std::string ct_public_key_data;
CHECK(base::Base64Decode(log_metadata[1], &ct_public_key_data))
<< "Unable to decode CT public key.";
- scoped_refptr<net::CTLogVerifier> external_log_verifier(
+ scoped_refptr<const net::CTLogVerifier> external_log_verifier(
net::CTLogVerifier::Create(ct_public_key_data, log_description,
log_url));
CHECK(external_log_verifier) << "Unable to parse CT public key.";
@@ -717,6 +717,8 @@ void IOThread::Init() {
}
}
+ globals_->ct_logs.assign(ct_logs.begin(), ct_logs.end());
+
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
// is fixed.
tracked_objects::ScopedTracker tracking_profile9(
@@ -730,7 +732,7 @@ void IOThread::Init() {
net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier();
globals_->cert_transparency_verifier.reset(ct_verifier);
// Add built-in logs
- ct_verifier->AddLogs(ct_logs);
+ ct_verifier->AddLogs(globals_->ct_logs);
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
// is fixed.
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698