upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcrypto: link engines and the legacy provider to libcrypto

Browse source 
OpenSSL's legacy provider module and engines need to link to
libcrypto.so, as it provides some of the actual implementations of
legacy routines.

This is a little tricky due to build order issues.  Introduce a small
hack (LIBCRYPTO_WITHOUT_SUBDIRS) that builds libcrypto.so in its usual
early phase without any OpenSSL provider modules or engines.  This is
intended to restore the test suite; a future change should remove the
hack and replace it with a better approach.

PR:		254853, 273528
Discussed with:	Folks at EuroBSDCon in Coimbra
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 1a18383a52bc373e316d224cef1298debf6f7e25)
This commit is contained in:
Pierre Pronchery 2023-09-15 17:14:16 +02:00 committed by Ed Maste
parent 51d54ed615
commit fd4b13acd9
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.inc1
View file

@ -2980,7 +2980,7 @@ libraries: .MAKE .PHONY
${_+_}cd ${.CURDIR}; \
${MAKE} -f Makefile.inc1 _prereq_libs; \
${MAKE} -f Makefile.inc1 _startup_libs; \
${MAKE} -f Makefile.inc1 _prebuild_libs; \
${MAKE} -f Makefile.inc1 _prebuild_libs -DLIBCRYPTO_WITHOUT_SUBDIRS; \
${MAKE} -f Makefile.inc1 _generic_libs
#

2
secure/lib/libcrypto/Makefile
View file

@ -1,6 +1,8 @@
SHLIBDIR?= /lib
.if !defined(LIBCRYPTO_WITHOUT_SUBDIRS)
SUBDIR= engines modules
.endif
.include <bsd.own.mk>
.include <src.opts.mk>

2
secure/lib/libcrypto/engines/Makefile.inc
View file

@ -16,6 +16,8 @@ CFLAGS+= -DB_ENDIAN
.endif
CFLAGS+= -DNDEBUG
LIBADD= crypto
.PATH: ${LCRYPTO_SRC}/engines
WARNS?= 0

1
secure/lib/libcrypto/modules/legacy/Makefile
View file

@ -1,5 +1,6 @@
SHLIB_NAME?= legacy.so
LIBADD= crypto
SRCS+= legacyprov.c prov_running.c