mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ondřej Surý
2018-05-11 13:39:42 +02:00
committed by Evan Hunt
parent cb578fae92
commit 23c1f7e506
20 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/confgen/Makefile.in
View File

@@ -22,7 +22,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \ CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@

2
bin/confgen/unix/Makefile.in
View File

@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \ CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \
${DNS_INCLUDES} ${ISC_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
OBJS = os.@O@ OBJS = os.@O@

2
bin/pkcs11/Makefile.in
View File

@@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${ISC_INCLUDES} CINCLUDES = ${ISC_INCLUDES}
CDEFINES = CDEFINES = @CRYPTO@
ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

2
bin/rndc/Makefile.in
View File

@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \ CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@

2
bin/tests/pkcs11/Makefile.in
View File

@@ -17,7 +17,7 @@ PROVIDER = @PKCS11_PROVIDER@
CINCLUDES = ${ISC_INCLUDES} CINCLUDES = ${ISC_INCLUDES}
CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\" CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\" @CRYPTO@
ISCLIBS = ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ ISCLIBS = ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

2
bin/tests/pkcs11/benchmarks/Makefile.in
View File

@@ -17,7 +17,7 @@ PROVIDER = @PKCS11_PROVIDER@
CINCLUDES = ${ISC_INCLUDES} CINCLUDES = ${ISC_INCLUDES}
CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\" CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\" @CRYPTO@
ISCLIBS = ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

2
bin/tests/system/Makefile.in
View File

@@ -19,7 +19,7 @@ SUBDIRS = dlzexternal dyndb pipelined rndc rpz rsabigexponent tkey
CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES} CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES}
CDEFINES = @USE_GSSAPI@ CDEFINES = @USE_GSSAPI@ @CRYPTO@
CWARNINGS = CWARNINGS =
DNSLIBS = DNSLIBS =

2
bin/tests/system/rndc/Makefile.in
View File

@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${ISC_INCLUDES} CINCLUDES = ${ISC_INCLUDES}
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
ISCLIBS = ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

2
bin/tests/system/rpz/Makefile.in
View File

@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES} CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES}
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
DNSLIBS = DNSLIBS =

2
contrib/dlz/bin/dlzbdb/Makefile.in
View File

@@ -17,7 +17,7 @@ DLZINCLUDES = @DLZ_DRIVER_INCLUDES@
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \
${ISC_INCLUDES} ${DLZINCLUDES} ${ISC_INCLUDES} ${DLZINCLUDES}
CDEFINES = @CONTRIB_DLZ@ CDEFINES = @CONTRIB_DLZ@ @CRYPTO@
CWARNINGS = CWARNINGS =
DLZLIBS = @DLZ_DRIVER_LIBS@ DLZLIBS = @DLZ_DRIVER_LIBS@

2
lib/irs/tests/Makefile.in
View File

@@ -20,7 +20,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_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@ CFGLIBS = ../../isccfg/libisccfg.@A@
CFGDEPLIBS = ../../isccfg/libisccfg.@A@ CFGDEPLIBS = ../../isccfg/libisccfg.@A@

8
lib/isc/include/isc/platform.h.in
View File

@@ -18,6 +18,14 @@
***** Platform-dependent defines. ***** 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. *** Network.
***/ ***/

2
lib/isc/nls/Makefile.in
View File

@@ -16,7 +16,7 @@ CINCLUDES = -I../unix/include \
-I../include \ -I../include \
-I${srcdir}/../include -I${srcdir}/../include
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
OBJS = msgcat.@O@ OBJS = msgcat.@O@

2
lib/isc/nothreads/Makefile.in
View File

@@ -17,7 +17,7 @@ CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../include \ -I${srcdir}/../include \
-I${srcdir}/.. -I${srcdir}/..
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
THREADOPTOBJS = condition.@O@ mutex.@O@ THREADOPTOBJS = condition.@O@ mutex.@O@

2
lib/isc/pthreads/Makefile.in
View File

@@ -17,7 +17,7 @@ CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../include \ -I${srcdir}/../include \
-I${srcdir}/.. -I${srcdir}/..
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
OBJS = condition.@O@ mutex.@O@ thread.@O@ OBJS = condition.@O@ mutex.@O@ thread.@O@

2
lib/isc/win32/Makefile.in
View File

@@ -15,7 +15,7 @@ CINCLUDES = -I${srcdir}/.. \
-I./include \ -I./include \
-I${srcdir}/include \ -I${srcdir}/include \
-I${srcdir}/../include -I${srcdir}/../include
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
# Alphabetically # Alphabetically

8
lib/isc/win32/include/isc/platform.h.in
View File

@@ -31,6 +31,14 @@
#endif #endif
#endif #endif
/***
*** Enforce OpenSSL or PKCS#11 cryptography
***/
#if !defined(OPENSSL) && !defined(PKCS11CRYPTO)
#error No cryptography library has been found or provided.
#endif
/*** /***
*** Network. *** Network.
***/ ***/

2
lib/isccfg/Makefile.in
View File

@@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@

2
lib/ns/Makefile.in
View File

@@ -28,7 +28,7 @@ CINCLUDES = -I. -I${top_srcdir}/lib/ns -Iinclude \
${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
@DST_OPENSSL_INC@ @DST_GSSAPI_INC@ @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =

2
lib/samples/Makefile-postinstall.in
View File

@@ -11,7 +11,7 @@ srcdir = @srcdir@
#prefix = @prefix@ #prefix = @prefix@
#exec_prefix = @exec_prefix@ #exec_prefix = @exec_prefix@
CDEFINES = CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
DNSLIBS = -ldns @DNS_CRYPTO_LIBS@ DNSLIBS = -ldns @DNS_CRYPTO_LIBS@