From 6cbc8c56cfb66d812e5b9f335973b11b213f5665 Mon Sep 17 00:00:00 2001 From: tb <> Date: Mon, 25 Aug 2025 16:48:02 +0000 Subject: Move opensslconf.h to a machine-independent place After drilling through many layers of fossilized turds from a long-forgotten millenium, jsing and I finally found oil^Wa machine-independent version of opensslconf.h. Remove the no longer needed versions in arch/*/ and move one copy to the top level. Add an RCS tag and place the remaining garbage in the public domain. ok jsing --- src/lib/libcrypto/Makefile | 4 ++-- src/lib/libcrypto/arch/aarch64/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/alpha/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/amd64/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/arm/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/hppa/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/i386/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/m88k/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/mips64/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/powerpc/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/powerpc64/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/riscv64/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/sh/opensslconf.h | 13 ------------- src/lib/libcrypto/arch/sparc64/opensslconf.h | 13 ------------- src/lib/libcrypto/opensslconf.h | 18 ++++++++++++++++++ 15 files changed, 20 insertions(+), 171 deletions(-) delete mode 100644 src/lib/libcrypto/arch/aarch64/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/alpha/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/amd64/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/arm/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/hppa/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/i386/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/m88k/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/mips64/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/powerpc/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/powerpc64/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/riscv64/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/sh/opensslconf.h delete mode 100644 src/lib/libcrypto/arch/sparc64/opensslconf.h create mode 100644 src/lib/libcrypto/opensslconf.h (limited to 'src') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 459b0c9235..5ee28b0e6c 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.242 2025/08/14 15:48:48 beck Exp $ +# $OpenBSD: Makefile,v 1.243 2025/08/25 16:48:01 tb Exp $ LIB= crypto LIBREBUILD=y @@ -674,6 +674,7 @@ HDRS=\ ${LCRYPTO_SRC}/modes/modes.h \ ${LCRYPTO_SRC}/objects/objects.h \ ${LCRYPTO_SRC}/ocsp/ocsp.h \ + ${LCRYPTO_SRC}/opensslconf.h \ ${LCRYPTO_SRC}/opensslfeatures.h \ ${LCRYPTO_SRC}/opensslv.h \ ${LCRYPTO_SRC}/ossl_typ.h \ @@ -699,7 +700,6 @@ HDRS=\ ${LCRYPTO_SRC}/x509/x509v3.h HDRS_GEN=\ - ${.CURDIR}/arch/${MACHINE_CPU}/opensslconf.h \ ${.OBJDIR}/obj_mac.h prereq: obj_mac.h diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/arch/aarch64/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/aarch64/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/alpha/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/amd64/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/arm/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/hppa/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/i386/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/m88k/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/mips64/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/powerpc/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/powerpc64/opensslconf.h b/src/lib/libcrypto/arch/powerpc64/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/powerpc64/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/riscv64/opensslconf.h b/src/lib/libcrypto/arch/riscv64/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/riscv64/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/sh/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h deleted file mode 100644 index c31bcc01ad..0000000000 --- a/src/lib/libcrypto/arch/sparc64/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/src/lib/libcrypto/opensslconf.h b/src/lib/libcrypto/opensslconf.h new file mode 100644 index 0000000000..5371f182c7 --- /dev/null +++ b/src/lib/libcrypto/opensslconf.h @@ -0,0 +1,18 @@ +/* $OpenBSD: opensslconf.h,v 1.3 2025/08/25 16:48:01 tb Exp $ */ +/* + * Public domain. + */ + +#include + +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + +#ifndef OPENSSL_FILE +#ifdef OPENSSL_NO_FILENAMES +#define OPENSSL_FILE "" +#define OPENSSL_LINE 0 +#else +#define OPENSSL_FILE __FILE__ +#define OPENSSL_LINE __LINE__ +#endif +#endif -- cgit v1.2.3-55-g6feb