ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

address win32 build issues

Browse Source 
- Replace external -DOPENSSL/-DPKCS11CRYPTO with properly AC_DEFINEd
  HAVE_OPENSSL/HAVE_PKCS11
- Don't enforce the crypto provider from platform.h, just from dst_api.c
  and configure scripts
This commit is contained in:
Ondřej Surý
2018-05-22 15:24:37 +02:00
committed by Evan Hunt
parent 9b6b11f02a
commit 7ee8a7e69f
137 changed files with 265 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/Makefile.in
View File

@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
@DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
BACKTRACECFLAGS = @BACKTRACECFLAGS@

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

@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
@DST_OPENSSL_INC@ @DST_GSSAPI_INC@
CDEFINES = @CRYPTO@ @USE_GSSAPI@
CDEFINES = @USE_GSSAPI@
CWARNINGS =
BACKTRACECFLAGS = @BACKTRACECFLAGS@

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

@@ -17,7 +17,7 @@ PROVIDER = @PKCS11_PROVIDER@
CINCLUDES = ${ISC_INCLUDES}
CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\" @CRYPTO@
CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\"
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}
CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\" @CRYPTO@
CDEFINES = -DPK11_LIB_LOCATION=\"${PROVIDER}\"
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}
CDEFINES = @USE_GSSAPI@ @CRYPTO@
CDEFINES = @USE_GSSAPI@
CWARNINGS =
DNSLIBS =

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

@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
LIBS = @LIBS@

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

@@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
DNSLIBS = ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

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

@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

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

@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${ISC_INCLUDES}
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
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}
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
DNSLIBS =

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

@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

22
bin/tests/system/rsabigexponent/bigkey.c
View File

@@ -12,8 +12,6 @@
#include <config.h>
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
#include <stdio.h>
#include <stdlib.h>
@@ -40,7 +38,7 @@
#include <dst/dst.h>
#include <dst/result.h>
#if !defined(OPENSSL)
#if !HAVE_OPENSSL
/*
* Use a fixed key file pair if compiled without OpenSSL.
@@ -105,7 +103,7 @@ main(int argc, char **argv) {
return(0);
}
#else
#else /* !HAVE_OPENSSL */
#include <openssl/err.h>
#include <openssl/objects.h>
#include <openssl/rsa.h>
@@ -220,20 +218,4 @@ main(int argc, char **argv) {
}
#endif
#else /* OPENSSL || PKCS11CRYPTO */
#include <stdio.h>
#include <stdlib.h>
#include <isc/util.h>
int
main(int argc, char **argv) {
UNUSED(argc);
UNUSED(argv);
fprintf(stderr, "Compiled without Crypto\n");
exit(1);
}
#endif /* OPENSSL || PKCS11CRYPTO */
/*! \file */

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

@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CDEFINES =
CWARNINGS =
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

1
bin/tests/virtual-time/vtwrapper.c
View File

@@ -9,6 +9,7 @@
* information regarding copyright ownership.
*/
#include <config.h>
#define _GNU_SOURCE
#include <sys/syscall.h>