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

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index d2a6b692b331158706df629d47f6aa8245fa75e5..83daebfe4a31b4e611a2555a8e4d419971dcbfc9 100644 (file)
--- 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@

diff --git a/bin/confgen/unix/Makefile.in b/bin/confgen/unix/Makefile.in
index 64e3cb8bb5b6509a67af5c5e1953b61131074200..af1452dbb3b99b39a9c4c6f3ffb5631c89eb5c14 100644 (file)
--- 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@

diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index d33fc2094ac3dfd18ed0d98d2d5de74892794202..e93251894399300a03e98785d7e60504273e3f57 100644 (file)
--- 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@
 

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index ba68e781f84415470df3ab862ab686a2fb8fb5db..51983483a959f00ad5b19d719d1a0f2f0b20b109 100644 (file)
--- 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@

diff --git a/bin/tests/pkcs11/Makefile.in b/bin/tests/pkcs11/Makefile.in
index 73e059670509c0c6693a4f652615e7993cc27d69..29b1f3f0c706e20dc4693032c74c7040c5498ade 100644 (file)
--- 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@
 

diff --git a/bin/tests/pkcs11/benchmarks/Makefile.in b/bin/tests/pkcs11/benchmarks/Makefile.in
index 15f5460044bed439a92e48259b25a42f6ab9a5cd..3ee3821eec927e7b2adaad97546117ddaf4a88e5 100644 (file)
--- 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@
 

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index a552f4667e04325d5485c4e64eedebf39f1c70d5..d40917fab7541d2242b29b331a6323c72350ce3d 100644 (file)
--- 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 =

diff --git a/bin/tests/system/rndc/Makefile.in b/bin/tests/system/rndc/Makefile.in
index 999c1e6e9ff12ab087f1553bf7c204911012712c..000958b21fe15f13c77f3347463567c0c0086508 100644 (file)
--- 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@

diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in
index 9ec63448cda68bc7e6388d8fc688f8d6f392090b..f44619dfc25225eb749b1b5c0ae173f919d5ddc5 100644 (file)
--- 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 =

diff --git a/contrib/dlz/bin/dlzbdb/Makefile.in b/contrib/dlz/bin/dlzbdb/Makefile.in
index abda98d107bfdde1b58fb59ffbb2f750f3e131c9..8c9823c97a0ee3297d1f3906ab68b6245e764238 100644 (file)
--- 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@

diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index f1bd3c01c483c7b9e15288803287991279c4c8bc..c4e3b7fdb54b0824a68a4cd4e73a72ae0f1f24be 100644 (file)
--- 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@

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 9a74ee64d53a36478b6fadefaf30026d1b844aed..822cbead76b1e66f935d098e0219457563338ee5 100644 (file)
--- 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.
  ***/

diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in
index 704deadbea5025ba5bf95f1a4997a19b0ff980e8..1acb767561d500727dfa9ba28fe673f10bb01373 100644 (file)
--- 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@

diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in
index c79477363e6ccdf789ff4aa17ecee8e684b09fca..9f20d59831feb2c3a19b6d3971d4a364fc7d7e8b 100644 (file)
--- 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@

diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in
index af4fd6ec2994fbc17a8b28c93b5e3d84a3c4bcb1..c3ba6a04e3566cfc598ab65326ca6211494f5610 100644 (file)
--- 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@

diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index 19b46bdec4b8191743bb871160cc121dda00b56c..1c5d56793bcb0ce4963e26e8aa0faffca28e0883 100644 (file)
--- 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

diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index d7f94a6ff09e1c602f6c446b8838b38d662f570d..b34e99b3e25ffd2479ea89150a5169f73cd416da 100644 (file)
--- 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.
  ***/

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 4625fcd97b26dcb63c48ef04feabd1cdd4a9f630..62dbef000a4bbd8d9cf96f2a5d9ac7b14140e1e0 100644 (file)
--- 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@

diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index e81eeb33673111e69ecc2f1f9d163803ac85ca9a..1b26c0cbca3d8458ab12d9810fc4e8fba513fbf7 100644 (file)
--- 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 =
 

diff --git a/lib/samples/Makefile-postinstall.in b/lib/samples/Makefile-postinstall.in
index cf114da6a15956f596a04ea8408bcf599fa02e95..8d5421f98c92090812a1202e4c78f72b159a5ec9 100644 (file)
--- 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@