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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing header ordering. Created 4 years, 8 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
« net/quic/quic_stream_factory.cc ('K') | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | net/socket/ssl_client_socket_unittest.cc » ('J')
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 cfad9deeba2a2981115cfc13664f878413d77e11..71051850c084fe99d83752e3e93cad47ce7d8438 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -59,7 +59,7 @@
#include "net/ssl/ssl_key_logger.h"
#endif
-#if defined(USE_NSS_VERIFIER)
+#if defined(USE_NSS_CERTS)
#include "net/cert_net/nss_ocsp.h"
#endif
@@ -396,7 +396,6 @@ class SSLClientSocketOpenSSL::PeerCertificateChain {
// this will behave as if Reset(NULL) was called.
void Reset(STACK_OF(X509)* chain);
- // Note that when USE_OPENSSL is defined, OSCertHandle is X509*
davidben 2016/04/18 19:36:45 I think this comment is still valid. It was just n
svaldez 2016/04/18 20:21:39 Done.
scoped_refptr<X509Certificate> AsOSChain() const;
size_t size() const {
@@ -877,7 +876,7 @@ int SSLClientSocketOpenSSL::Init() {
DCHECK(!ssl_);
DCHECK(!transport_bio_);
-#if defined(USE_NSS_VERIFIER)
+#if defined(USE_NSS_CERTS)
if (ssl_config_.cert_io_enabled) {
// TODO(davidben): Move this out of SSLClientSocket. See
// https://crbug.com/539520.
« net/quic/quic_stream_factory.cc ('K') | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | net/socket/ssl_client_socket_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698