git: 0b27be500a94 - main - libcrypto: expand the common Makefile for providers

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Tue, 04 Jul 2023 19:08:21 UTC
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=0b27be500a947b76385a4a179e6f61d83af6adb3

commit 0b27be500a947b76385a4a179e6f61d83af6adb3
Author:     Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2023-06-30 17:20:31 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-07-04 19:04:56 +0000

    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:   https://github.com/freebsd/freebsd-src/pull/787
---
 secure/lib/libcrypto/modules/Makefile.inc    | 4 +++-
 secure/lib/libcrypto/modules/fips/Makefile   | 3 +--
 secure/lib/libcrypto/modules/legacy/Makefile | 6 +-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc
index 9047c938ef1d..6e74ff36a9cf 100644
--- 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
index 84123381bb1d..510d017d27ab 100644
--- 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
index 3eef2549d44f..c98ca9553e20 100644
--- 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 \