summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2025-08-25 16:48:02 +0000
committertb <>2025-08-25 16:48:02 +0000
commit6cbc8c56cfb66d812e5b9f335973b11b213f5665 (patch)
treeaf61c3bd67a849abe3033878ae534cd5184035e4 /src
parent8d69d0f7a170ebed7efc8c4a2097bc0d203981db (diff)
downloadopenbsd-6cbc8c56cfb66d812e5b9f335973b11b213f5665.tar.gz
openbsd-6cbc8c56cfb66d812e5b9f335973b11b213f5665.tar.bz2
openbsd-6cbc8c56cfb66d812e5b9f335973b11b213f5665.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/Makefile4
-rw-r--r--src/lib/libcrypto/arch/alpha/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/amd64/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/arm/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/hppa/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/i386/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/m88k/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/mips64/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/powerpc/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/powerpc64/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/riscv64/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/sh/opensslconf.h13
-rw-r--r--src/lib/libcrypto/arch/sparc64/opensslconf.h13
-rw-r--r--src/lib/libcrypto/opensslconf.h (renamed from src/lib/libcrypto/arch/aarch64/opensslconf.h)5
14 files changed, 7 insertions, 158 deletions
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 @@
1# $OpenBSD: Makefile,v 1.242 2025/08/14 15:48:48 beck Exp $ 1# $OpenBSD: Makefile,v 1.243 2025/08/25 16:48:01 tb Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -674,6 +674,7 @@ HDRS=\
674 ${LCRYPTO_SRC}/modes/modes.h \ 674 ${LCRYPTO_SRC}/modes/modes.h \
675 ${LCRYPTO_SRC}/objects/objects.h \ 675 ${LCRYPTO_SRC}/objects/objects.h \
676 ${LCRYPTO_SRC}/ocsp/ocsp.h \ 676 ${LCRYPTO_SRC}/ocsp/ocsp.h \
677 ${LCRYPTO_SRC}/opensslconf.h \
677 ${LCRYPTO_SRC}/opensslfeatures.h \ 678 ${LCRYPTO_SRC}/opensslfeatures.h \
678 ${LCRYPTO_SRC}/opensslv.h \ 679 ${LCRYPTO_SRC}/opensslv.h \
679 ${LCRYPTO_SRC}/ossl_typ.h \ 680 ${LCRYPTO_SRC}/ossl_typ.h \
@@ -699,7 +700,6 @@ HDRS=\
699 ${LCRYPTO_SRC}/x509/x509v3.h 700 ${LCRYPTO_SRC}/x509/x509v3.h
700 701
701HDRS_GEN=\ 702HDRS_GEN=\
702 ${.CURDIR}/arch/${MACHINE_CPU}/opensslconf.h \
703 ${.OBJDIR}/obj_mac.h 703 ${.OBJDIR}/obj_mac.h
704 704
705prereq: obj_mac.h 705prereq: obj_mac.h
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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#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 @@
1#include <openssl/opensslfeatures.h>
2
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
4
5#ifndef OPENSSL_FILE
6#ifdef OPENSSL_NO_FILENAMES
7#define OPENSSL_FILE ""
8#define OPENSSL_LINE 0
9#else
10#define OPENSSL_FILE __FILE__
11#define OPENSSL_LINE __LINE__
12#endif
13#endif
diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/opensslconf.h
index c31bcc01ad..5371f182c7 100644
--- a/src/lib/libcrypto/arch/aarch64/opensslconf.h
+++ b/src/lib/libcrypto/opensslconf.h
@@ -1,3 +1,8 @@
1/* $OpenBSD: opensslconf.h,v 1.3 2025/08/25 16:48:01 tb Exp $ */
2/*
3 * Public domain.
4 */
5
1#include <openssl/opensslfeatures.h> 6#include <openssl/opensslfeatures.h>
2 7
3#undef OPENSSL_EXPORT_VAR_AS_FUNCTION 8#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-09 01:14:57 +0000