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

Unified Diff: net/cert/x509_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: 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/cert/x509_util_nss.h ('k') | net/http/des.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_util_nss.cc
diff --git a/net/cert/x509_util_nss.cc b/net/cert/x509_util_nss.cc
index b138bd405af42ed79ea51220bed302de41b2c5a9..9711ef601165b30b4d0f5116888cbe60e4c74b14 100644
--- a/net/cert/x509_util_nss.cc
+++ b/net/cert/x509_util_nss.cc
@@ -194,7 +194,7 @@ bool SignCertificate(
return true;
}
-#if defined(USE_NSS) || defined(OS_IOS)
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
// Callback for CERT_DecodeCertPackage(), used in
// CreateOSCertHandlesFromBytes().
SECStatus PR_CALLBACK CollectCertsCallback(void* arg,
@@ -244,7 +244,7 @@ CERTName* CreateCertNameFromEncoded(PLArenaPool* arena,
return name.release();
}
-#endif // defined(USE_NSS) || defined(OS_IOS)
+#endif // defined(USE_NSS_CERTS) || defined(OS_IOS)
} // namespace
@@ -368,7 +368,7 @@ bool CreateChannelIDEC(crypto::ECPrivateKey* key,
return true;
}
-#if defined(USE_NSS) || defined(OS_IOS)
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
void ParsePrincipal(CERTName* name, CertPrincipal* principal) {
// Starting in NSS 3.15, CERTGetNameFunc takes a const CERTName* argument.
#if NSS_VMINOR >= 15
@@ -631,7 +631,7 @@ std::string GetUniqueNicknameForSlot(const std::string& nickname,
return new_name;
}
-#endif // defined(USE_NSS) || defined(OS_IOS)
+#endif // defined(USE_NSS_CERTS) || defined(OS_IOS)
} // namespace x509_util
« no previous file with comments | « net/cert/x509_util_nss.h ('k') | net/http/des.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698