From: beck <beck@openbsd.org>
Date: Mon, 8 Jul 2024 17:01:54 +0000 (+0000)
Subject: Guard variable declarations to unbreak non-namespaced builds.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=76da589ead7900c81daeb2036e6ee9bd0af8dfe2;p=openbsd

Guard variable declarations to unbreak non-namespaced builds.

ok tb@
---

diff --git a/lib/libcrypto/hidden/openssl/asn1.h b/lib/libcrypto/hidden/openssl/asn1.h
index d45d6770d9b..3325cf4bef9 100644
--- a/lib/libcrypto/hidden/openssl/asn1.h
+++ b/lib/libcrypto/hidden/openssl/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.14 2024/07/08 14:52:31 beck Exp $ */
+/* $OpenBSD: asn1.h,v 1.15 2024/07/08 17:01:54 beck Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -233,6 +233,7 @@ LCRYPTO_USED(SMIME_text);
 LCRYPTO_USED(ERR_load_ASN1_strings);
 LCRYPTO_UNUSED(ASN1_UTCTIME_cmp_time_t);
 LCRYPTO_UNUSED(ASN1_dup);
+#if defined(LIBRESSL_NAMESPACE)
 extern LCRYPTO_USED(ASN1_SEQUENCE_ANY_it);
 extern LCRYPTO_USED(ASN1_SET_ANY_it);
 extern LCRYPTO_USED(ASN1_ANY_it);
@@ -256,5 +257,6 @@ extern LCRYPTO_USED(ASN1_GENERALSTRING_it);
 extern LCRYPTO_USED(ASN1_UTCTIME_it);
 extern LCRYPTO_USED(ASN1_GENERALIZEDTIME_it);
 extern LCRYPTO_USED(ASN1_TIME_it);
+#endif
 
 #endif /* _LIBCRYPTO_ASN1_H */
diff --git a/lib/libcrypto/hidden/openssl/asn1t.h b/lib/libcrypto/hidden/openssl/asn1t.h
index 59f99baf756..17bcb4e4538 100644
--- a/lib/libcrypto/hidden/openssl/asn1t.h
+++ b/lib/libcrypto/hidden/openssl/asn1t.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1t.h,v 1.4 2024/07/08 16:24:22 beck Exp $ */
+/* $OpenBSD: asn1t.h,v 1.5 2024/07/08 17:01:54 beck Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -29,10 +29,12 @@ LCRYPTO_USED(ASN1_item_ex_new);
 LCRYPTO_USED(ASN1_item_ex_free);
 LCRYPTO_USED(ASN1_item_ex_d2i);
 LCRYPTO_USED(ASN1_item_ex_i2d);
+#if defined(LIBRESSL_NAMESPACE)
 extern LCRYPTO_USED(ASN1_SEQUENCE_it);
 extern LCRYPTO_USED(BIGNUM_it);
 extern LCRYPTO_USED(LONG_it);
 extern LCRYPTO_USED(ZLONG_it);
 extern LCRYPTO_UNUSED(CBIGNUM_it);
+#endif
 
 #endif /* _LIBCRYPTO_ASN1T_H */
diff --git a/lib/libcrypto/hidden/openssl/ocsp.h b/lib/libcrypto/hidden/openssl/ocsp.h
index c25f4ad75eb..fa19c286128 100644
--- a/lib/libcrypto/hidden/openssl/ocsp.h
+++ b/lib/libcrypto/hidden/openssl/ocsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp.h,v 1.2 2024/07/08 14:53:11 beck Exp $ */
+/* $OpenBSD: ocsp.h,v 1.3 2024/07/08 17:01:54 beck Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -186,6 +186,7 @@ LCRYPTO_USED(OCSP_REQUEST_print);
 LCRYPTO_USED(OCSP_RESPONSE_print);
 LCRYPTO_USED(OCSP_basic_verify);
 LCRYPTO_USED(ERR_load_OCSP_strings);
+#if defined(LIBRESSL_NAMESPACE)
 extern LCRYPTO_USED(OCSP_RESPID_it);
 extern LCRYPTO_USED(OCSP_SINGLERESP_it);
 extern LCRYPTO_USED(OCSP_CERTSTATUS_it);
@@ -202,5 +203,6 @@ extern LCRYPTO_USED(OCSP_SIGNATURE_it);
 extern LCRYPTO_USED(OCSP_REQINFO_it);
 extern LCRYPTO_USED(OCSP_CRLID_it);
 extern LCRYPTO_USED(OCSP_SERVICELOC_it);
+#endif
 
 #endif /* _LIBCRYPTO_OCSP_H */
diff --git a/lib/libcrypto/hidden/openssl/pkcs7.h b/lib/libcrypto/hidden/openssl/pkcs7.h
index faa422c129f..b531b298d05 100644
--- a/lib/libcrypto/hidden/openssl/pkcs7.h
+++ b/lib/libcrypto/hidden/openssl/pkcs7.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.h,v 1.4 2024/07/08 16:23:27 beck Exp $ */
+/* $OpenBSD: pkcs7.h,v 1.5 2024/07/08 17:01:54 beck Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -125,6 +125,7 @@ LCRYPTO_USED(SMIME_write_PKCS7);
 LCRYPTO_USED(SMIME_read_PKCS7);
 LCRYPTO_USED(BIO_new_PKCS7);
 LCRYPTO_USED(ERR_load_PKCS7_strings);
+#if defined(LIBRESSL_NAMESPACE)
 extern LCRYPTO_USED(PKCS7_ISSUER_AND_SERIAL_it);
 extern LCRYPTO_USED(PKCS7_SIGNER_INFO_it);
 extern LCRYPTO_USED(PKCS7_RECIP_INFO_it);
@@ -137,6 +138,6 @@ extern LCRYPTO_USED(PKCS7_ENCRYPT_it);
 extern LCRYPTO_USED(PKCS7_it);
 extern LCRYPTO_USED(PKCS7_ATTR_SIGN_it);
 extern LCRYPTO_USED(PKCS7_ATTR_VERIFY_it);
-
+#endif
 
 #endif /* _LIBCRYPTO_PKCS7_H */
diff --git a/lib/libcrypto/hidden/openssl/x509.h b/lib/libcrypto/hidden/openssl/x509.h
index 4a211b0e66e..d80a3b2576c 100644
--- a/lib/libcrypto/hidden/openssl/x509.h
+++ b/lib/libcrypto/hidden/openssl/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.6 2024/07/08 14:48:49 beck Exp $ */
+/* $OpenBSD: x509.h,v 1.7 2024/07/08 17:01:54 beck Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -463,6 +463,7 @@ LCRYPTO_USED(PKCS8_pkey_get0_attrs);
 LCRYPTO_USED(PKCS8_pkey_add1_attr_by_NID);
 LCRYPTO_USED(X509_PUBKEY_set0_param);
 LCRYPTO_USED(X509_PUBKEY_get0_param);
+#if defined(LIBRESSL_NAMESPACE)
 extern LCRYPTO_USED(X509_ALGOR_it);
 extern LCRYPTO_USED(X509_ALGORS_it);
 extern LCRYPTO_USED(X509_VAL_it);
@@ -484,5 +485,6 @@ extern LCRYPTO_USED(NETSCAPE_SPKI_it);
 extern LCRYPTO_USED(NETSCAPE_SPKAC_it);
 extern LCRYPTO_USED(PBEPARAM_it);
 extern LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_it);
+#endif
 
 #endif /* _LIBCRYPTO_X509_H */
diff --git a/lib/libcrypto/hidden/openssl/x509v3.h b/lib/libcrypto/hidden/openssl/x509v3.h
index dac12ab09b2..1799d4811d0 100644
--- a/lib/libcrypto/hidden/openssl/x509v3.h
+++ b/lib/libcrypto/hidden/openssl/x509v3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509v3.h,v 1.8 2024/07/08 14:47:44 beck Exp $ */
+/* $OpenBSD: x509v3.h,v 1.9 2024/07/08 17:01:54 beck Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -252,6 +252,7 @@ LCRYPTO_USED(X509v3_addr_validate_path);
 LCRYPTO_USED(X509v3_asid_validate_resource_set);
 LCRYPTO_USED(X509v3_addr_validate_resource_set);
 LCRYPTO_USED(ERR_load_X509V3_strings);
+#if defined(LIBRESSL_NAMESPACE)
 extern LCRYPTO_USED(BASIC_CONSTRAINTS_it);
 extern LCRYPTO_USED(AUTHORITY_KEYID_it);
 extern LCRYPTO_USED(PKEY_USAGE_PERIOD_it);
@@ -285,6 +286,6 @@ extern LCRYPTO_USED(IPAddressRange_it);
 extern LCRYPTO_USED(IPAddressOrRange_it);
 extern LCRYPTO_USED(IPAddressChoice_it);
 extern LCRYPTO_USED(IPAddressFamily_it);
-
+#endif
 
 #endif /* _LIBCRYPTO_X509V3_H */