summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2023-05-26 22:26:10 +0000
committerriastradh <riastradh@NetBSD.org>2023-05-26 22:26:10 +0000
commit5ebe2d43a160aee855031380bd7b0332f948e670 (patch)
tree0b18064eff027bd44f69f61f73b929fd041ae3c7 /crypto
parentb346068282d3b13d45c364af446f60bfaa528250 (diff)
Revert "openssl: Nix build goo for dynamically loaded engines."
Turns out there is a regression lurking here: the devcrypto engine was made dynamic-only (https://github.com/openssl/openssl/pull/7859), so to maintain that functionality, we need to build dynamic engines. Will fix the aarch64 build issue and wire things up separately.
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, 114 insertions, 0 deletions
diff --git a/crypto/external/bsd/openssl/lib/engines/Makefile b/crypto/external/bsd/openssl/lib/engines/Makefile
new file mode 100644
index 00000000000..71136b37112
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.4 2023/05/26 22:26:10 riastradh 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
new file mode 100644
index 00000000000..3d7c61791df
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/capi/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh 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
new file mode 100644
index 00000000000..7a26b813827
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/capi/capi.map
@@ -0,0 +1,6 @@
+{
+ 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
new file mode 100644
index 00000000000..831f47affb5
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/dasync/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh 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
new file mode 100644
index 00000000000..7a26b813827
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
@@ -0,0 +1,6 @@
+{
+ 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
new file mode 100644
index 00000000000..0d2074ca077
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh 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
new file mode 100644
index 00000000000..7a26b813827
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
@@ -0,0 +1,6 @@
+{
+ 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
new file mode 100644
index 00000000000..24ca95b63b3
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/engines.mk
@@ -0,0 +1,34 @@
+# $NetBSD: engines.mk,v 1.5 2023/05/26 22:26:10 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
new file mode 100644
index 00000000000..be1ed7d5fca
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh 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
new file mode 100644
index 00000000000..7a26b813827
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
@@ -0,0 +1,6 @@
+{
+ 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
new file mode 100644
index 00000000000..670c3d208fc
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh 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
new file mode 100644
index 00000000000..7a26b813827
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
@@ -0,0 +1,6 @@
+{
+ 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
new file mode 100644
index 00000000000..442394ef728
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/padlock/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh 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
new file mode 100644
index 00000000000..7a26b813827
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};