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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/ssl/channel_id_service.cc

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/ssl/openssl_platform_key_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/channel_id_service.cc
diff --git a/net/ssl/channel_id_service.cc b/net/ssl/channel_id_service.cc
index e52d470ce931421316186fbe50981a3f1c7800e6..7fcbc539b32187d0e1abcacc140a62eb88672876 100644
--- a/net/ssl/channel_id_service.cc
+++ b/net/ssl/channel_id_service.cc
@@ -27,7 +27,7 @@
#include "net/cert/x509_util.h"
#include "url/gurl.h"
-#if defined(USE_NSS_CERTS)
+#if !defined(USE_OPENSSL)
#include <private/pprthred.h> // PR_DetachThread
#endif
@@ -246,7 +246,7 @@ class ChannelIDServiceWorker {
scoped_ptr<ChannelIDStore::ChannelID> cert =
GenerateChannelID(server_identifier_, serial_number_, &error);
DVLOG(1) << "GenerateCert " << server_identifier_ << " returned " << error;
-#if defined(USE_NSS_CERTS)
+#if !defined(USE_OPENSSL)
// Detach the thread from NSPR.
// Calling NSS functions attaches the thread to NSPR, which stores
// the NSPR thread ID in thread-specific data.
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/ssl/openssl_platform_key_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698