[src/trunk]: src/crypto/external/bsd/openssl/lib/engines more engines and map...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fffd871fe3aa
branches:  trunk
changeset: 374598:fffd871fe3aa
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 07 16:21:19 2023 +0000

description:
more engines and maps for them

diffstat:

 crypto/external/bsd/openssl/lib/engines/Makefile                      |   4 ++--
 crypto/external/bsd/openssl/lib/engines/capi/capi.map                 |   6 ++++++
 crypto/external/bsd/openssl/lib/engines/dasync/dasync.map             |   6 ++++++
 crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile            |   6 ++++++
 crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map       |   6 ++++++
 crypto/external/bsd/openssl/lib/engines/engines.mk                    |  10 ++++------
 crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile         |   6 ++++++
 crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map |   6 ++++++
 crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map         |   6 ++++++
 crypto/external/bsd/openssl/lib/engines/padlock/padlock.map           |   6 ++++++
 10 files changed, 54 insertions(+), 8 deletions(-)

diffs (125 lines):

diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/Makefile
--- a/crypto/external/bsd/openssl/lib/engines/Makefile  Sun May 07 16:19:24 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/Makefile  Sun May 07 16:21:19 2023 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2023/05/07 16:21:19 christos Exp $
 
 .include "bsd.own.mk"
 
 # OpenSSL engines.
-SUBDIR= capi dasync ossltest padlock
+SUBDIR= capi dasync devcrypto loader_attic ossltest padlock
 
 .include <bsd.subdir.mk>
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/capi/capi.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/capi/capi.map     Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+{
+    global:
+        bind_engine;
+        v_check;
+    local: *;
+};
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+{
+    global:
+        bind_engine;
+        v_check;
+    local: *;
+};
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile        Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+#      $NetBSD: Makefile,v 1.1 2023/05/07 16:21:19 christos Exp $
+
+LIB=   devcrypto
+SRCS=  e_devcrypto.c
+
+.include "../engines.mk"
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map   Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+{
+    global:
+        bind_engine;
+        v_check;
+    local: *;
+};
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/engines.mk
--- a/crypto/external/bsd/openssl/lib/engines/engines.mk        Sun May 07 16:19:24 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/engines.mk        Sun May 07 16:21:19 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: engines.mk,v 1.1 2018/12/08 23:24:01 christos Exp $
+#      $NetBSD: engines.mk,v 1.2 2023/05/07 16:21:19 christos Exp $
 
 NOLINT=                # don't build a lint library
 NOPROFILE=     # don't build a profile library
@@ -15,11 +15,7 @@ CRYPTODIST=     ${NETBSDSRCDIR}/crypto
 
 CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
  
-.if defined(MLIBDIR)
-LIBDIR=/usr/lib/${MLIBDIR}/openssl
-.else
-LIBDIR=/usr/lib/openssl
-.endif
+LIBDIR=${OSSL_ENGINESDIR}
 
 .if ${MKPIC} != "no"
 .PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so
@@ -28,6 +24,8 @@ libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.
 libinstall::
 .endif
 
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
+
 .include <bsd.lib.mk>
 
 ${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile     Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+#      $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 -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map     Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+{
+    global:
+        bind_engine;
+        v_check;
+    local: *;
+};
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map     Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+{
+    global:
+        bind_engine;
+        v_check;
+    local: *;
+};
diff -r baa351071ca5 -r fffd871fe3aa crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map       Sun May 07 16:21:19 2023 +0000
@@ -0,0 +1,6 @@
+{
+    global:
+        bind_engine;
+        v_check;
+    local: *;
+};