Hide struct internals under LIBRESSL_CRYPTO_INTERNAL so that other

parts of LibreSSL can no longer reach into them.

discussed with beck, jsing

1 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 70e3f756c6..43b2307c8f 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.84 2021/10/31 16:29:58 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.85 2021/10/31 16:51:16 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -139,7 +139,7 @@ typedef struct X509_val_st {
         ASN1_TIME *notAfter;
 } X509_VAL;
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 struct X509_pubkey_st {
         X509_ALGOR *algor;
         ASN1_BIT_STRING *public_key;
@@ -164,7 +164,7 @@ typedef struct X509_name_entry_st X509_NAME_ENTRY;
 
 DECLARE_STACK_OF(X509_NAME_ENTRY)
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 /* we always keep X509_NAMEs in 2 forms. */
 struct X509_name_st {
         STACK_OF(X509_NAME_ENTRY) *entries;
@@ -184,7 +184,7 @@ DECLARE_STACK_OF(X509_NAME)
 
 #define X509_EX_V_NETSCAPE_HACK         0x8000
 #define X509_EX_V_INIT                  0x0001
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 typedef struct X509_extension_st {
         ASN1_OBJECT *object;
         ASN1_BOOLEAN critical;
@@ -199,7 +199,7 @@ typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 DECLARE_STACK_OF(X509_EXTENSION)
 
 /* a sequence of these are used */
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 typedef struct x509_attributes_st {
         ASN1_OBJECT *object;
         int single; /* 0 for a set, 1 for a single item (which is wrong) */
@@ -216,7 +216,7 @@ typedef struct x509_attributes_st X509_ATTRIBUTE;
 DECLARE_STACK_OF(X509_ATTRIBUTE)
 
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 typedef struct X509_req_info_st {
         ASN1_ENCODING enc;
         ASN1_INTEGER *version;
@@ -258,7 +258,7 @@ typedef struct x509_cinf_st X509_CINF;
  * the end of the certificate itself
  */
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 typedef struct x509_cert_aux_st {
         STACK_OF(ASN1_OBJECT) *trust;           /* trusted uses */
         STACK_OF(ASN1_OBJECT) *reject;          /* rejected uses */
@@ -272,7 +272,7 @@ typedef struct x509_cert_aux_st X509_CERT_AUX;
 
 struct x509_st;
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 struct x509_st {
         X509_CINF *cert_info;
         X509_ALGOR *sig_alg;
@@ -422,7 +422,7 @@ DECLARE_STACK_OF(X509_TRUST)
                         XN_FLAG_FN_LN | \
                         XN_FLAG_FN_ALIGN)
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 struct x509_revoked_st {
         ASN1_INTEGER *serialNumber;
         ASN1_TIME *revocationDate;
@@ -437,7 +437,7 @@ struct x509_revoked_st {
 
 DECLARE_STACK_OF(X509_REVOKED)
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 typedef struct X509_crl_info_st {
         ASN1_INTEGER *version;
         X509_ALGOR *sig_alg;
@@ -452,7 +452,7 @@ typedef struct X509_crl_info_st {
 typedef struct X509_crl_info_st X509_CRL_INFO;
 #endif
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 struct X509_crl_st {
         /* actual signature */
         X509_CRL_INFO *crl;
@@ -564,7 +564,7 @@ typedef struct PBKDF2PARAM_st {
 
 /* PKCS#8 private key info structure */
 
-#if defined(LIBRESSL_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
+#if defined(LIBRESSL_CRYPTO_INTERNAL) || !defined(LIBRESSL_OPAQUE_X509)
 struct pkcs8_priv_key_info_st {
         ASN1_INTEGER *version;
         X509_ALGOR *pkeyalg;