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

Unified Diff: chrome/browser/io_thread.cc

Issue 517083002: Enable Certificate Transparency in the OpenSSL port. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ct-objects-extractor
Patch Set: move comment Created 6 years, 3 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
« no previous file with comments | « no previous file | net/cert/asn1_util.h » ('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 736e757be07fd8386fe0449340f496857e8a9f60..1db82b253b1588485630afcb84cda5b1a62d07f6 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -49,7 +49,9 @@
#include "net/cert/cert_verifier.h"
#include "net/cert/cert_verify_proc.h"
#include "net/cert/ct_known_logs.h"
+#include "net/cert/ct_log_verifier.h"
#include "net/cert/ct_verifier.h"
+#include "net/cert/multi_log_ct_verifier.h"
#include "net/cert/multi_threaded_cert_verifier.h"
#include "net/cookies/cookie_store.h"
#include "net/dns/host_cache.h"
@@ -88,11 +90,6 @@
#include "chrome/browser/extensions/event_router_forwarder.h"
#endif
-#if !defined(USE_OPENSSL)
-#include "net/cert/ct_log_verifier.h"
-#include "net/cert/multi_log_ct_verifier.h"
-#endif
-
#if defined(USE_NSS) || defined(OS_IOS)
#include "net/ocsp/nss_ocsp.h"
#endif
@@ -593,10 +590,8 @@ void IOThread::InitAsync() {
net::CertVerifyProc::CreateDefault()));
#endif
- globals_->transport_security_state.reset(new net::TransportSecurityState());
-#if !defined(USE_OPENSSL)
- // For now, Certificate Transparency is only implemented for platforms
- // that use NSS.
+ globals_->transport_security_state.reset(new net::TransportSecurityState());
+
net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier();
globals_->cert_transparency_verifier.reset(ct_verifier);
@@ -628,12 +623,7 @@ void IOThread::InitAsync() {
ct_verifier->AddLog(external_log_verifier.Pass());
}
}
-#else
- if (command_line.HasSwitch(switches::kCertificateTransparencyLog)) {
- LOG(DFATAL) << "Certificate Transparency is not yet supported in Chrome "
- "builds using OpenSSL.";
- }
-#endif
+
globals_->ssl_config_service = GetSSLConfigService();
#if defined(SPDY_PROXY_AUTH_ORIGIN)
« no previous file with comments | « no previous file | net/cert/asn1_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698