libcrypto: expand the common Makefile for providers

OpenSSL 3 supports a modular architecture, allowing different providers to bring specific implementations of cryptographical algorithms. This change adds mandatory source files to every provider. Sponsored by: The FreeBSD Foundation Pull Request: freebsd/freebsd-src#787
bsdjhb · Sep 2, 2023 · 08aa1be · 08aa1be
2 parents ec16ead + 0b27be5
commit 08aa1be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc
@@ -9,7 +9,9 @@ CFLAGS+=	-I${LCRYPTO_SRC}/include
 CFLAGS+=	-I${LCRYPTO_SRC}/providers/common/include
 CFLAGS+=	-I${LCRYPTO_SRC}/providers/implementations/include
 
-.include <bsd.endian.mk>
+# common
+SRCS+=	provider_err.c provider_ctx.c
+SRCS+=	provider_util.c
 
 .PATH:	${LCRYPTO_SRC}/providers \
 	${LCRYPTO_SRC}/providers/common

diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile
@@ -238,8 +238,7 @@ SRCS+=	keccak1600.c
 .endif
 
 # common
-SRCS+=	provider_err.c provider_ctx.c
-SRCS+=	provider_util.c capabilities.c bio_prov.c digest_to_nid.c \
+SRCS+=	capabilities.c bio_prov.c digest_to_nid.c \
 	securitycheck.c provider_seeding.c
 SRCS+=	securitycheck_fips.c
 

diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile
@@ -2,11 +2,7 @@
 
 SHLIB_NAME?=	legacy.so
 
-SRCS=	legacyprov.c prov_running.c
-
-# common
-SRCS+=	provider_err.c provider_ctx.c
-SRCS+=	provider_util.c
+SRCS+=	legacyprov.c prov_running.c
 
 # ciphers
 SRCS+=	ciphercommon.c ciphercommon_hw.c ciphercommon_block.c \