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

Unified Diff: components/webcrypto/nss/aes_kw_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: 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 | « components/ownership/owner_key_util_impl.cc ('k') | components/webcrypto/nss/rsa_hashed_algorithm_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/webcrypto/nss/aes_kw_nss.cc
diff --git a/components/webcrypto/nss/aes_kw_nss.cc b/components/webcrypto/nss/aes_kw_nss.cc
index cc690e8dd4746f6b418f2bf455a790e403c0766b..77afb1fc53b92f242e95deda880d0bef8ac4c04e 100644
--- a/components/webcrypto/nss/aes_kw_nss.cc
+++ b/components/webcrypto/nss/aes_kw_nss.cc
@@ -46,7 +46,7 @@ Status DoUnwrapSymKeyAesKw(const CryptoData& wrapped_key_data,
// The plaintext length is always 64 bits less than the data size.
const unsigned int plaintext_length = wrapped_key_data.byte_length() - 8;
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// Part of workaround for
// https://bugzilla.mozilla.org/show_bug.cgi?id=981170. See the explanation
// later in this function.
@@ -63,7 +63,7 @@ Status DoUnwrapSymKeyAesKw(const CryptoData& wrapped_key_data,
if (!new_key)
return Status::OperationError();
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=981170
// which was fixed in NSS 3.16.0.
// If unwrap fails, NSS nevertheless returns a valid-looking PK11SymKey,
« no previous file with comments | « components/ownership/owner_key_util_impl.cc ('k') | components/webcrypto/nss/rsa_hashed_algorithm_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698