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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/child/webcrypto/nss/util_nss.cc

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: long line 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
« build/config/BUILD.gn ('K') | « content/child/webcrypto/nss/rsa_hashed_algorithm_nss.cc ('k') | content/child/webcrypto/test/test_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/nss/util_nss.cc
diff --git a/content/child/webcrypto/nss/util_nss.cc b/content/child/webcrypto/nss/util_nss.cc
index e313a55a967350163128f36ef15a0b0ba76498ee..108ee4e32547be1318f0702ea868a00c3a94cc92 100644
--- a/content/child/webcrypto/nss/util_nss.cc
+++ b/content/child/webcrypto/nss/util_nss.cc
@@ -10,7 +10,7 @@
#include "crypto/nss_util.h"
#include "crypto/scoped_nss_types.h"
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
#include <dlfcn.h>
#include <secoid.h>
#endif
@@ -44,7 +44,7 @@ NssRuntimeSupport* NssRuntimeSupport::Get() {
}
NssRuntimeSupport::NssRuntimeSupport() : internal_slot_does_oaep_(false) {
-#if !defined(USE_NSS)
+#if !defined(USE_NSS_CERTS)
// Using a bundled version of NSS that is guaranteed to have this symbol.
pk11_encrypt_func_ = PK11_Encrypt;
pk11_decrypt_func_ = PK11_Decrypt;
« build/config/BUILD.gn ('K') | « content/child/webcrypto/nss/rsa_hashed_algorithm_nss.cc ('k') | content/child/webcrypto/test/test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698