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

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 418173004: Enable and fix CRLSet and remoting tests on non-Android OpenSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add a TODO Created 6 years, 5 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/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_openssl.cc
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index a962715a4f620e7364a629d5ca1fe3962352bd49..cc68d6c0fb73b3459a18dc338cd02dc3c47b260c 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -944,7 +944,15 @@ int SSLClientSocketOpenSSL::DoVerifyCert(int result) {
server_cert_.get(),
host_and_port_.host(),
flags,
- NULL /* no CRL set */,
+#if defined(OS_NACL)
+ // NaCl doesn't build the SSLConfigService.
+ //
+ // TODO(davidben): Route the CRLSet through SSLConfig so
+ // SSLClientSocket doesn't depend on SSLConfigService.
Ryan Sleevi 2014/08/04 23:48:46 File a bug against a TODO like this? No clue why
davidben 2014/08/06 00:02:27 Filed https://code.google.com/p/chromium/issues/de
+ NULL,
+#else
+ SSLConfigService::GetCRLSet().get(),
+#endif
&server_cert_verify_result_,
base::Bind(&SSLClientSocketOpenSSL::OnHandshakeIOComplete,
base::Unretained(this)),
« no previous file with comments | « no previous file | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698