From: tb <tb@openbsd.org>
Date: Fri, 1 Mar 2024 07:38:33 +0000 (+0000)
Subject: Fix OPENSSL_{gmtime,timegm} in namespace build
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=76ca5827b4659570f4ab038546005c351327b6d0;p=openbsd

Fix OPENSSL_{gmtime,timegm} in namespace build

These were incorrectly added to asn1.h. OPENSSL_gmtime is in crypto.h
and OPENSSL_timegm is already in posix_time.h
---

diff --git a/lib/libcrypto/hidden/openssl/asn1.h b/lib/libcrypto/hidden/openssl/asn1.h
index 11db7b9902e..63852d1e678 100644
--- a/lib/libcrypto/hidden/openssl/asn1.h
+++ b/lib/libcrypto/hidden/openssl/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.7 2023/11/13 12:46:07 beck Exp $ */
+/* $OpenBSD: asn1.h,v 1.8 2024/03/01 07:38:33 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -249,7 +249,5 @@ LCRYPTO_USED(SMIME_text);
 LCRYPTO_USED(ERR_load_ASN1_strings);
 LCRYPTO_USED(ASN1_time_parse);
 LCRYPTO_USED(ASN1_time_tm_cmp);
-LCRYPTO_USED(OPENSSL_gmtime);
-LCRYPTO_USED(OPENSSL_timegm);
 
 #endif /* _LIBCRYPTO_ASN1_H */
diff --git a/lib/libcrypto/hidden/openssl/crypto.h b/lib/libcrypto/hidden/openssl/crypto.h
index dc0b7a02b16..083d156d148 100644
--- a/lib/libcrypto/hidden/openssl/crypto.h
+++ b/lib/libcrypto/hidden/openssl/crypto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.h,v 1.2 2023/07/28 10:19:20 tb Exp $ */
+/* $OpenBSD: crypto.h,v 1.3 2024/03/01 07:38:33 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -71,6 +71,7 @@ LCRYPTO_USED(OpenSSLDie);
 LCRYPTO_USED(OPENSSL_cpu_caps);
 LCRYPTO_USED(OPENSSL_init_crypto);
 LCRYPTO_USED(OPENSSL_cleanup);
+LCRYPTO_USED(OPENSSL_gmtime);
 LCRYPTO_USED(ERR_load_CRYPTO_strings);
 
 #endif /* _LIBCRYPTO_CRYPTO_H */