Commit 23c1f7e5 authored by Ondřej Surý's avatar Ondřej Surý Committed by Evan Hunt
Browse files

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

parent cb578fae
......@@ -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@
......
......@@ -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@
......
......@@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${ISC_INCLUDES}
CDEFINES =
CDEFINES = @CRYPTO@
ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
......
......@@ -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@
......
......@@ -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@
......
......@@ -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@
......
......@@ -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 =
......
......@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${ISC_INCLUDES}
CDEFINES =
CDEFINES = @CRYPTO@
CWARNINGS =
ISCLIBS = ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
......
......@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES}
CDEFINES =
CDEFINES = @CRYPTO@
CWARNINGS =
DNSLIBS =
......
......@@ -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@
......
......@@ -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@
......
......@@ -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.
***/
......
......@@ -16,7 +16,7 @@ CINCLUDES = -I../unix/include \
-I../include \
-I${srcdir}/../include
CDEFINES =
CDEFINES = @CRYPTO@
CWARNINGS =
OBJS = msgcat.@O@
......
......@@ -17,7 +17,7 @@ CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../include \
-I${srcdir}/..
CDEFINES =
CDEFINES = @CRYPTO@
CWARNINGS =
THREADOPTOBJS = condition.@O@ mutex.@O@
......
......@@ -17,7 +17,7 @@ CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../include \
-I${srcdir}/..
CDEFINES =
CDEFINES = @CRYPTO@
CWARNINGS =
OBJS = condition.@O@ mutex.@O@ thread.@O@
......
......@@ -15,7 +15,7 @@ CINCLUDES = -I${srcdir}/.. \
-I./include \
-I${srcdir}/include \
-I${srcdir}/../include
CDEFINES =
CDEFINES = @CRYPTO@
CWARNINGS =
# Alphabetically
......
......@@ -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.
***/
......
......@@ -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@
......
......@@ -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 =
......
......@@ -11,7 +11,7 @@ srcdir = @srcdir@
#prefix = @prefix@
#exec_prefix = @exec_prefix@
CDEFINES =
CDEFINES = @CRYPTO@
CWARNINGS =
DNSLIBS = -ldns @DNS_CRYPTO_LIBS@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment