net/socket/ssl_client_socket_openssl.cc - Issue 1808963004: Adding macro to enable changing SSL library (Part 1)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 1808963004: Adding macro to enable changing SSL library (Part 1) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove remoting_nacl change. Created 4 years, 9 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: 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 8a860f35ba4fee669f8b7cf277527755f1b4b47c..be0aadfc6c41e8ff128f35aac2d3c514098f9475 100644

--- a/net/socket/ssl_client_socket_openssl.cc

+++ b/net/socket/ssl_client_socket_openssl.cc

@@ -58,7 +58,7 @@

#include "net/ssl/ssl_key_logger.h"

#endif

-#if defined(USE_NSS_CERTS) || defined(OS_IOS)

+#if defined(USE_NSS_VERIFIER)

#include "net/cert_net/nss_ocsp.h"

#endif

@@ -887,7 +887,7 @@ int SSLClientSocketOpenSSL::Init() {

DCHECK(!ssl_);

DCHECK(!transport_bio_);

-#if defined(USE_NSS_CERTS) || defined(OS_IOS)

+#if defined(USE_NSS_VERIFIER)

if (ssl_config_.cert_io_enabled) {

// TODO(davidben): Move this out of SSLClientSocket. See

// https://crbug.com/539520.

« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/test/embedded_test_server/embedded_test_server_unittest.cc » ('j') | no next file with comments »