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

Unified Diff: net/cert/x509_certificate.h

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/test_root_certs_unittest.cc ('k') | net/cert/x509_certificate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_certificate.h
diff --git a/net/cert/x509_certificate.h b/net/cert/x509_certificate.h
index 6c0f0e97e332c1988ac41741b526288228b8ad61..11ac0bb673074c0a88b9e405c941acbc957e29db 100644
--- a/net/cert/x509_certificate.h
+++ b/net/cert/x509_certificate.h
@@ -28,7 +28,7 @@
// Forward declaration; real one in <x509.h>
typedef struct x509_st X509;
typedef struct x509_store_st X509_STORE;
-#elif defined(USE_NSS)
+#elif defined(USE_NSS_CERTS)
// Forward declaration; real one in <cert.h>
struct CERTCertificateStr;
#endif
@@ -59,7 +59,7 @@ class NET_EXPORT X509Certificate
typedef SecCertificateRef OSCertHandle;
#elif defined(USE_OPENSSL_CERTS)
typedef X509* OSCertHandle;
-#elif defined(USE_NSS)
+#elif defined(USE_NSS_CERTS)
typedef struct CERTCertificateStr* OSCertHandle;
#else
// TODO(ericroman): not implemented
@@ -155,7 +155,7 @@ class NET_EXPORT X509Certificate
// The returned pointer must be stored in a scoped_refptr<X509Certificate>.
static X509Certificate* CreateFromBytes(const char* data, int length);
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// Create an X509Certificate from the DER-encoded representation.
// |nickname| can be NULL if an auto-generated nickname is desired.
// Returns NULL on failure. The returned pointer must be stored in a
@@ -362,7 +362,7 @@ class NET_EXPORT X509Certificate
static OSCertHandle CreateOSCertHandleFromBytes(const char* data,
int length);
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// Creates an OS certificate handle from the DER-encoded representation.
// Returns NULL on failure. Sets the default nickname if |nickname| is
// non-NULL.
@@ -508,7 +508,7 @@ class NET_EXPORT X509Certificate
// that may be needed for chain building.
OSCertHandles intermediate_ca_certs_;
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// This stores any default nickname that has been set on the certificate
// at creation time with CreateFromBytesWithNickname.
// If this is empty, then GetDefaultNickname will return a generated name
« no previous file with comments | « net/cert/test_root_certs_unittest.cc ('k') | net/cert/x509_certificate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698