Enforce usage of OpenSSL or PKCS#11 library in platform.h header

2025-08-30 05:57:52 +00:00 · 2018-05-11 13:39:42 +02:00 · 2018-05-11 13:39:42 +02:00 · 23c1f7e506
commit 23c1f7e506
parent cb578fae92
20 changed files with 34 additions and 18 deletions
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@ -22,7 +22,7 @@ VERSION=@BIND9_VERSION@
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
 	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
--- a/bin/confgen/unix/Makefile.in
+++ b/bin/confgen/unix/Makefile.in
@ -16,7 +16,7 @@ top_srcdir =	@top_srcdir@
 CINCLUDES =	-I${srcdir}/include -I${srcdir}/../include \
 		${DNS_INCLUDES} ${ISC_INCLUDES}

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 OBJS =		os.@O@
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@ -15,7 +15,7 @@ top_srcdir =	@top_srcdir@

 CINCLUDES =	${ISC_INCLUDES}

-CDEFINES =
+CDEFINES =	@CRYPTO@

 ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
 	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
--- a/bin/tests/pkcs11/Makefile.in
+++ b/bin/tests/pkcs11/Makefile.in
@ -17,7 +17,7 @@ PROVIDER =	@PKCS11_PROVIDER@

 CINCLUDES =	${ISC_INCLUDES}

-CDEFINES =	-DPK11_LIB_LOCATION=\"${PROVIDER}\"
+CDEFINES =	-DPK11_LIB_LOCATION=\"${PROVIDER}\" @CRYPTO@

 ISCLIBS =	../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

--- a/bin/tests/pkcs11/benchmarks/Makefile.in
+++ b/bin/tests/pkcs11/benchmarks/Makefile.in
@ -17,7 +17,7 @@ PROVIDER =	@PKCS11_PROVIDER@

 CINCLUDES =	${ISC_INCLUDES}

-CDEFINES =	-DPK11_LIB_LOCATION=\"${PROVIDER}\"
+CDEFINES =	-DPK11_LIB_LOCATION=\"${PROVIDER}\" @CRYPTO@

 ISCLIBS =	../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@ -19,7 +19,7 @@ SUBDIRS =	dlzexternal dyndb pipelined rndc rpz rsabigexponent tkey

 CINCLUDES =	${ISC_INCLUDES} ${DNS_INCLUDES}

-CDEFINES =	@USE_GSSAPI@
+CDEFINES =	@USE_GSSAPI@ @CRYPTO@
 CWARNINGS =

 DNSLIBS =
--- a/bin/tests/system/rndc/Makefile.in
+++ b/bin/tests/system/rndc/Makefile.in
@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@

 CINCLUDES =	${ISC_INCLUDES}

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 ISCLIBS =	../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
--- a/bin/tests/system/rpz/Makefile.in
+++ b/bin/tests/system/rpz/Makefile.in
@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@

 CINCLUDES =     ${ISC_INCLUDES} ${DNS_INCLUDES}

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 DNSLIBS =
--- a/contrib/dlz/bin/dlzbdb/Makefile.in
+++ b/contrib/dlz/bin/dlzbdb/Makefile.in
@ -17,7 +17,7 @@ DLZINCLUDES =	@DLZ_DRIVER_INCLUDES@
 CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include \
                ${ISC_INCLUDES} ${DLZINCLUDES}

-CDEFINES =      @CONTRIB_DLZ@
+CDEFINES =      @CONTRIB_DLZ@ @CRYPTO@
 CWARNINGS =

 DLZLIBS = 	@DLZ_DRIVER_LIBS@
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@ -20,7 +20,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@

 CINCLUDES =	-I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES}
-CDEFINES =	-DTESTS="\"${top_builddir}/lib/irs/tests/\""
+CDEFINES =	-DTESTS="\"${top_builddir}/lib/irs/tests/\"" @CRYPTO@

 CFGLIBS =	../../isccfg/libisccfg.@A@
 CFGDEPLIBS =	../../isccfg/libisccfg.@A@
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@ -18,6 +18,14 @@
 ***** Platform-dependent defines.
 *****/

+/***
+ *** Enforce OpenSSL or PKCS#11 cryptography
+ ***/
+
+#if !defined(OPENSSL) && !defined(PKCS11CRYPTO)
+#error No cryptography library has been found or provided.
+#endif
+
 /***
 *** Network.
 ***/
--- a/lib/isc/nls/Makefile.in
+++ b/lib/isc/nls/Makefile.in
@ -16,7 +16,7 @@ CINCLUDES =	-I../unix/include \
 		-I../include \
 		-I${srcdir}/../include

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 OBJS =		msgcat.@O@
--- a/lib/isc/nothreads/Makefile.in
+++ b/lib/isc/nothreads/Makefile.in
@ -17,7 +17,7 @@ CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../include \
 		-I${srcdir}/..

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 THREADOPTOBJS = condition.@O@ mutex.@O@
--- a/lib/isc/pthreads/Makefile.in
+++ b/lib/isc/pthreads/Makefile.in
@ -17,7 +17,7 @@ CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../include \
 		-I${srcdir}/..

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 OBJS =		condition.@O@ mutex.@O@ thread.@O@
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/Makefile.in
@ -15,7 +15,7 @@ CINCLUDES =	-I${srcdir}/.. \
 		-I./include \
 		-I${srcdir}/include \
 		-I${srcdir}/../include
-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 # Alphabetically
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@ -31,6 +31,14 @@
 #endif
 #endif

+/***
+ *** Enforce OpenSSL or PKCS#11 cryptography
+ ***/
+
+#if !defined(OPENSSL) && !defined(PKCS11CRYPTO)
+#error No cryptography library has been found or provided.
+#endif
+
 /***
 *** Network.
 ***/
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@

 CINCLUDES =	-I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
--- a/lib/ns/Makefile.in
+++ b/lib/ns/Makefile.in
@ -28,7 +28,7 @@ CINCLUDES =	-I. -I${top_srcdir}/lib/ns -Iinclude \
 		${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
 		@DST_OPENSSL_INC@ @DST_GSSAPI_INC@

-CDEFINES =
+CDEFINES =	@CRYPTO@

 CWARNINGS =

--- a/lib/samples/Makefile-postinstall.in
+++ b/lib/samples/Makefile-postinstall.in
@ -11,7 +11,7 @@ srcdir =	@srcdir@
 #prefix =	@prefix@
 #exec_prefix =	@exec_prefix@

-CDEFINES =
+CDEFINES =	@CRYPTO@
 CWARNINGS =

 DNSLIBS =	-ldns @DNS_CRYPTO_LIBS@