summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-03-01 07:38:33 +0000
committertb <>2024-03-01 07:38:33 +0000
commit080b8d8f84513bbb7f0ddb6e06bcefe5fd926cd6 (patch)
tree2daf785cd5593f59001b196dc854c4a7d2df92ee /src
parent4065c14b5251969ddd6f55affe1a93df98f3dbdf (diff)
downloadopenbsd-080b8d8f84513bbb7f0ddb6e06bcefe5fd926cd6.tar.gz
openbsd-080b8d8f84513bbb7f0ddb6e06bcefe5fd926cd6.tar.bz2
openbsd-080b8d8f84513bbb7f0ddb6e06bcefe5fd926cd6.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/hidden/openssl/asn1.h4
-rw-r--r--src/lib/libcrypto/hidden/openssl/crypto.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/hidden/openssl/asn1.h b/src/lib/libcrypto/hidden/openssl/asn1.h
index 11db7b9902..63852d1e67 100644
--- a/src/lib/libcrypto/hidden/openssl/asn1.h
+++ b/src/lib/libcrypto/hidden/openssl/asn1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1.h,v 1.7 2023/11/13 12:46:07 beck Exp $ */ 1/* $OpenBSD: asn1.h,v 1.8 2024/03/01 07:38:33 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -249,7 +249,5 @@ LCRYPTO_USED(SMIME_text);
249LCRYPTO_USED(ERR_load_ASN1_strings); 249LCRYPTO_USED(ERR_load_ASN1_strings);
250LCRYPTO_USED(ASN1_time_parse); 250LCRYPTO_USED(ASN1_time_parse);
251LCRYPTO_USED(ASN1_time_tm_cmp); 251LCRYPTO_USED(ASN1_time_tm_cmp);
252LCRYPTO_USED(OPENSSL_gmtime);
253LCRYPTO_USED(OPENSSL_timegm);
254 252
255#endif /* _LIBCRYPTO_ASN1_H */ 253#endif /* _LIBCRYPTO_ASN1_H */
diff --git a/src/lib/libcrypto/hidden/openssl/crypto.h b/src/lib/libcrypto/hidden/openssl/crypto.h
index dc0b7a02b1..083d156d14 100644
--- a/src/lib/libcrypto/hidden/openssl/crypto.h
+++ b/src/lib/libcrypto/hidden/openssl/crypto.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: crypto.h,v 1.2 2023/07/28 10:19:20 tb Exp $ */ 1/* $OpenBSD: crypto.h,v 1.3 2024/03/01 07:38:33 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -71,6 +71,7 @@ LCRYPTO_USED(OpenSSLDie);
71LCRYPTO_USED(OPENSSL_cpu_caps); 71LCRYPTO_USED(OPENSSL_cpu_caps);
72LCRYPTO_USED(OPENSSL_init_crypto); 72LCRYPTO_USED(OPENSSL_init_crypto);
73LCRYPTO_USED(OPENSSL_cleanup); 73LCRYPTO_USED(OPENSSL_cleanup);
74LCRYPTO_USED(OPENSSL_gmtime);
74LCRYPTO_USED(ERR_load_CRYPTO_strings); 75LCRYPTO_USED(ERR_load_CRYPTO_strings);
75 76
76#endif /* _LIBCRYPTO_CRYPTO_H */ 77#endif /* _LIBCRYPTO_CRYPTO_H */