summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2023-05-26 13:21:51 +0000
committerriastradh <riastradh@NetBSD.org>2023-05-26 13:21:51 +0000
commit1e6bfbaffe3b9cf99e4cc7af67c5675127311e03 (patch)
treec1f68986f648ffc181715e9f83e22cbfe46ce671 /crypto
parentc5e5d244537a08fe677f9116eb988e0429c4add9 (diff)
openssl: Nix build goo for dynamically loaded engines.
- Engines are deprecated in openssl 3. - We never actually had the .so engines wired up to be built in openssl 1.1, and judging by the lack of obsolete entries in the set lists, I don't think we ever had them wired up to be built at all.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/openssl/lib/engines/Makefile8
-rw-r--r--crypto/external/bsd/openssl/lib/engines/capi/Makefile6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/capi/capi.map6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/dasync/Makefile6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/dasync/dasync.map6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/engines.mk34
-rw-r--r--crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/ossltest/Makefile6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/padlock/Makefile6
-rw-r--r--crypto/external/bsd/openssl/lib/engines/padlock/padlock.map6
14 files changed, 0 insertions, 114 deletions
diff --git a/crypto/external/bsd/openssl/lib/engines/Makefile b/crypto/external/bsd/openssl/lib/engines/Makefile
deleted file mode 100644
index 33e5f33b9e7..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2023/05/07 16:21:19 christos Exp $
-
-.include "bsd.own.mk"
-
-# OpenSSL engines.
-SUBDIR= capi dasync devcrypto loader_attic ossltest padlock
-
-.include <bsd.subdir.mk>
diff --git a/crypto/external/bsd/openssl/lib/engines/capi/Makefile b/crypto/external/bsd/openssl/lib/engines/capi/Makefile
deleted file mode 100644
index d94ac77ceaf..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/capi/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
-
-LIB= capi
-SRCS= e_capi.c e_capi_err.c
-
-.include "../engines.mk"
diff --git a/crypto/external/bsd/openssl/lib/engines/capi/capi.map b/crypto/external/bsd/openssl/lib/engines/capi/capi.map
deleted file mode 100644
index 7a26b813827..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/capi/capi.map
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- global:
- bind_engine;
- v_check;
- local: *;
-};
diff --git a/crypto/external/bsd/openssl/lib/engines/dasync/Makefile b/crypto/external/bsd/openssl/lib/engines/dasync/Makefile
deleted file mode 100644
index f4f3f34f2ef..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/dasync/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
-
-LIB= dasync
-SRCS= e_dasync.c e_dasync_err.c
-
-.include "../engines.mk"
diff --git a/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map b/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
deleted file mode 100644
index 7a26b813827..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- global:
- bind_engine;
- v_check;
- local: *;
-};
diff --git a/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile b/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile
deleted file mode 100644
index ef5b631e2f9..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2023/05/07 16:21:19 christos Exp $
-
-LIB= devcrypto
-SRCS= e_devcrypto.c
-
-.include "../engines.mk"
diff --git a/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map b/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
deleted file mode 100644
index 7a26b813827..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- global:
- bind_engine;
- v_check;
- local: *;
-};
diff --git a/crypto/external/bsd/openssl/lib/engines/engines.mk b/crypto/external/bsd/openssl/lib/engines/engines.mk
deleted file mode 100644
index c8cecfd7878..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/engines.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: engines.mk,v 1.3 2023/05/25 15:52:28 riastradh Exp $
-
-NOLINT= # don't build a lint library
-NOPROFILE= # don't build a profile library
-NOPICINSTALL= # don't install _pic.a library
-
-.include <bsd.own.mk>
-
-SHLIB_MAJOR=0
-SHLIB_MINOR=0
-
-CRYPTODIST= ${NETBSDSRCDIR}/crypto
-.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
-.PATH: ${OPENSSLSRC}/engines
-
-CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
-
-LIBDIR=${OSSL_ENGINESDIR}
-
-.if ${MKPIC} != "no"
-.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so
-libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so
-.else
-libinstall::
-.endif
-
-LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
-
-.include <bsd.lib.mk>
-
-${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}
- ${_MKTARGET_INSTALL}
- ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${.ALLSRC} ${.TARGET}
diff --git a/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile b/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile
deleted file mode 100644
index e64c5ff93dd..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2023/05/07 16:21:19 christos Exp $
-
-LIB= loader_attic
-SRCS= e_loader_attic.c
-
-.include "../engines.mk"
diff --git a/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map b/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
deleted file mode 100644
index 7a26b813827..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- global:
- bind_engine;
- v_check;
- local: *;
-};
diff --git a/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile b/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile
deleted file mode 100644
index de29a32e0d3..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2018/12/08 23:24:02 christos Exp $
-
-LIB= ossltest
-SRCS= e_ossltest.c e_ossltest_err.c
-
-.include "../engines.mk"
diff --git a/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map b/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
deleted file mode 100644
index 7a26b813827..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- global:
- bind_engine;
- v_check;
- local: *;
-};
diff --git a/crypto/external/bsd/openssl/lib/engines/padlock/Makefile b/crypto/external/bsd/openssl/lib/engines/padlock/Makefile
deleted file mode 100644
index fd8a77ab812..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/padlock/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2018/12/08 23:24:02 christos Exp $
-
-LIB= padlock
-SRCS= e_padlock.c
-
-.include "../engines.mk"
diff --git a/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map b/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
deleted file mode 100644
index 7a26b813827..00000000000
--- a/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- global:
- bind_engine;
- v_check;
- local: *;
-};