From deb6f0161a9109e7de9b519dc8dfb9478668dcdd Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 8 Dec 2018 23:24:01 +0000 Subject: [PATCH] Add engines infrastructure, not hooked to the build: 1. sets needs to be fixed 2. need to decide if I am going to add engine.so.MAJOR or use engine.so like OpenSSL wants 3. padlock is MD (x86) needs asm to be added, and conditionally built --- .../external/bsd/openssl/lib/engines/Makefile | 8 +++++ .../bsd/openssl/lib/engines/capi/Makefile | 6 ++++ .../bsd/openssl/lib/engines/dasync/Makefile | 6 ++++ .../bsd/openssl/lib/engines/engines.mk | 36 +++++++++++++++++++ .../bsd/openssl/lib/engines/ossltest/Makefile | 6 ++++ .../bsd/openssl/lib/engines/padlock/Makefile | 6 ++++ 6 files changed, 68 insertions(+) create mode 100644 crypto/external/bsd/openssl/lib/engines/Makefile create mode 100644 crypto/external/bsd/openssl/lib/engines/capi/Makefile create mode 100644 crypto/external/bsd/openssl/lib/engines/dasync/Makefile create mode 100644 crypto/external/bsd/openssl/lib/engines/engines.mk create mode 100644 crypto/external/bsd/openssl/lib/engines/ossltest/Makefile create mode 100644 crypto/external/bsd/openssl/lib/engines/padlock/Makefile diff --git a/crypto/external/bsd/openssl/lib/engines/Makefile b/crypto/external/bsd/openssl/lib/engines/Makefile new file mode 100644 index 000000000000..762ea21770d7 --- /dev/null +++ b/crypto/external/bsd/openssl/lib/engines/Makefile @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $ + +.include "bsd.own.mk" + +# OpenSSL engines. +SUBDIR= capi dasync ossltest padlock + +.include 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 000000000000..d94ac77ceafc --- /dev/null +++ b/crypto/external/bsd/openssl/lib/engines/capi/Makefile @@ -0,0 +1,6 @@ +# $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/dasync/Makefile b/crypto/external/bsd/openssl/lib/engines/dasync/Makefile new file mode 100644 index 000000000000..f4f3f34f2efd --- /dev/null +++ b/crypto/external/bsd/openssl/lib/engines/dasync/Makefile @@ -0,0 +1,6 @@ +# $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/engines.mk b/crypto/external/bsd/openssl/lib/engines/engines.mk new file mode 100644 index 000000000000..2bf19e241e56 --- /dev/null +++ b/crypto/external/bsd/openssl/lib/engines/engines.mk @@ -0,0 +1,36 @@ +# $NetBSD: engines.mk,v 1.1 2018/12/08 23:24:01 christos Exp $ + +NOLINT= # don't build a lint library +NOPROFILE= # don't build a profile library +NOPICINSTALL= # don't install _pic.a library + +.include + +SHLIB_MAJOR=0 +SHLIB_MINOR=0 + +CRYPTODIST= ${NETBSDSRCDIR}/crypto +.include "${NETBSDSRCDIR}/crypto/Makefile.openssl" +.PATH: ${OPENSSLSRC}/engines + +CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include + +.if defined(MLIBDIR) +LIBDIR=/usr/lib/${MLIBDIR}/openssl +.else +LIBDIR=/usr/lib/openssl +.endif + +.if ${MKPIC} != "no" +.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so +libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so +.else +libinstall:: +.endif + +.include + +${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/ossltest/Makefile b/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile new file mode 100644 index 000000000000..de29a32e0d36 --- /dev/null +++ b/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile @@ -0,0 +1,6 @@ +# $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/padlock/Makefile b/crypto/external/bsd/openssl/lib/engines/padlock/Makefile new file mode 100644 index 000000000000..fd8a77ab8121 --- /dev/null +++ b/crypto/external/bsd/openssl/lib/engines/padlock/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2018/12/08 23:24:02 christos Exp $ + +LIB= padlock +SRCS= e_padlock.c + +.include "../engines.mk"