From b98c56fd5e86fa76eb55a98a2266a923f64f705c Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 28 Feb 2023 01:51:41 -0600 Subject: stop exposing hidden defines in public opensslconf.h pull in hidden headers instead, patching drectly for Windows support --- include/CMakeLists.txt | 4 +--- include/openssl/Makefile.am.tpl | 23 ++++++++++------------- include/openssl/opensslconf.h.in | 15 --------------- 3 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 include/openssl/opensslconf.h.in (limited to 'include') diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index dafdee7..a08a781 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -7,8 +7,6 @@ if(ENABLE_LIBRESSL_INSTALL) PATTERN "Makefile*" EXCLUDE) endif(ENABLE_LIBRESSL_INSTALL) -file(READ openssl/opensslconf.h.in OPENSSLCONF) -file(WRITE openssl/opensslconf.h "${OPENSSLCONF}") if(HOST_AARCH64) file(READ arch/aarch64/opensslconf.h OPENSSLCONF) elseif(HOST_ARM) @@ -28,4 +26,4 @@ elseif(HOST_SPARC64) elseif(HOST_X86_64) file(READ arch/amd64/opensslconf.h OPENSSLCONF) endif() -file(APPEND openssl/opensslconf.h "${OPENSSLCONF}") +file(WRITE openssl/opensslconf.h "${OPENSSLCONF}") diff --git a/include/openssl/Makefile.am.tpl b/include/openssl/Makefile.am.tpl index 167183a..2f67d10 100644 --- a/include/openssl/Makefile.am.tpl +++ b/include/openssl/Makefile.am.tpl @@ -3,40 +3,37 @@ include $(top_srcdir)/Makefile.am.common if !ENABLE_LIBTLS_ONLY opensslincludedir=$(includedir)/openssl -noinst_HEADERS = opensslconf.h.in BUILT_SOURCES = opensslconf.h CLEANFILES = opensslconf.h -opensslconf.h: opensslconf.h.in Makefile +opensslconf.h: Makefile -echo "generating opensslconf.h ..." - -cp $(top_srcdir)/include/openssl/opensslconf.h.in opensslconf.h - -chmod u+w opensslconf.h if HOST_AARCH64 - -cat $(top_srcdir)/include/arch/aarch64/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/aarch64/opensslconf.h opensslconf.h endif if HOST_ARM - -cat $(top_srcdir)/include/arch/arm/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/arm/opensslconf.h opensslconf.h endif if HOST_I386 - -cat $(top_srcdir)/include/arch/i386/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/i386/opensslconf.h opensslconf.h endif if HOST_MIPS64 - -cat $(top_srcdir)/include/arch/mips64/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/mips64/opensslconf.h opensslconf.h endif if HOST_POWERPC - -cat $(top_srcdir)/include/arch/powerpc/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/powerpc/opensslconf.h opensslconf.h endif if HOST_POWERPC64 - -cat $(top_srcdir)/include/arch/powerpc64/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/powerpc64/opensslconf.h opensslconf.h endif if HOST_RISCV64 - -cat $(top_srcdir)/include/arch/riscv64/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/riscv64/opensslconf.h opensslconf.h endif if HOST_SPARC64 - -cat $(top_srcdir)/include/arch/sparc64/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/sparc64/opensslconf.h opensslconf.h endif if HOST_X86_64 - -cat $(top_srcdir)/include/arch/amd64/opensslconf.h >> opensslconf.h + -cp $(top_srcdir)/include/arch/amd64/opensslconf.h opensslconf.h endif opensslinclude_HEADERS = opensslconf.h diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in deleted file mode 100644 index 8842f00..0000000 --- a/include/openssl/opensslconf.h.in +++ /dev/null @@ -1,15 +0,0 @@ -#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__) -#define __attribute__(a) -#endif - -#if defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_NAMESPACE) -# define LCRYPTO_UNUSED(x) -# define LCRYPTO_USED(x) -# define LCRYPTO_ALIAS1(pre, x) -# define LCRYPTO_ALIAS(x) - -# define LSSL_UNUSED(x) -# define LSSL_USED(x) -# define LSSL_ALIAS(x) -#endif /* LIBRESSL_INTERNAL && !LIBRESSL_NAMESPACE */ - -- cgit v1.2.3-55-g6feb