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

Unified Diff: content/child/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: 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
Index: content/child/webcrypto/nss/aes_kw_nss.cc
diff --git a/content/child/webcrypto/nss/aes_kw_nss.cc b/content/child/webcrypto/nss/aes_kw_nss.cc
index e65e62fe844053ed63caf1226c94608657e1cbf1..edaa98cd87bf1838541372ba9ee138a978137814 100644
--- a/content/child/webcrypto/nss/aes_kw_nss.cc
+++ b/content/child/webcrypto/nss/aes_kw_nss.cc
@@ -48,7 +48,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.
@@ -65,7 +65,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,

Powered by Google App Engine
This is Rietveld 408576698