Merge pull request #249 from electron/ct-log-verifiers

Add verifiers for known certificate transparency logs
electron · Sep 21, 2016 · 0383c13 · 0383c13
2 parents 4c94ece + 1101f8f
commit 0383c13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/browser/url_request_context_getter.cc b/browser/url_request_context_getter.cc
@@ -22,8 +22,9 @@
 #include "content/public/common/content_switches.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/cert/cert_verifier.h"
+#include "net/cert/ct_known_logs.h"
+#include "net/cert/ct_log_verifier.h"
 #include "net/cert/ct_policy_enforcer.h"
-#include "net/cert/multi_log_ct_verifier.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/dns/mapped_host_resolver.h"
 #include "net/http/http_auth_filter.h"
@@ -277,6 +278,8 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     storage_->set_http_server_properties(std::move(server_properties));
 
     cert_transparency_verifier_.reset(new net::MultiLogCTVerifier());
+    cert_transparency_verifier_->AddLogs(
+        net::ct::CreateLogVerifiersForKnownLogs());
     ct_policy_enforcer_.reset(new net::CTPolicyEnforcer());
 
     net::HttpNetworkSession::Params network_session_params;

diff --git a/browser/url_request_context_getter.h b/browser/url_request_context_getter.h
@@ -8,6 +8,7 @@
 #include "base/files/file_path.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
+#include "net/cert/multi_log_ct_verifier.h"
 #include "net/http/http_cache.h"
 #include "net/http/url_security_manager.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -88,7 +89,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
   std::unique_ptr<net::HostMappingRules> host_mapping_rules_;
   std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences_;
   std::unique_ptr<net::HttpNetworkSession> http_network_session_;
-  std::unique_ptr<net::CTVerifier> cert_transparency_verifier_;
+  std::unique_ptr<net::MultiLogCTVerifier> cert_transparency_verifier_;
   std::unique_ptr<net::CTPolicyEnforcer> ct_policy_enforcer_;
   content::ProtocolHandlerMap protocol_handlers_;
   content::URLRequestInterceptorScopedVector protocol_interceptors_;