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
lib/dns/tests/Makefile.in
View File

@@ -21,7 +21,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
@DST_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\""
ISCLIBS = ../../isc/libisc.@A@ @ISC_OPENSSL_LIBS@
ISCDEPLIBS = ../../isc/libisc.@A@

4
lib/dns/tests/dh_test.c
View File

@@ -30,7 +30,7 @@
#include "dnstest.h"
#if defined(OPENSSL) && !defined(PK11_DH_DISABLE)
#if HAVE_OPENSSL && !defined(PK11_DH_DISABLE)
ATF_TC(isc_dh_computesecret);
ATF_TC_HEAD(isc_dh_computesecret, tc) {
@@ -83,7 +83,7 @@ ATF_TC_BODY(untested, tc) {
* Main
*/
ATF_TP_ADD_TCS(tp) {
#if defined(OPENSSL) && !defined(PK11_DH_DISABLE)
#if HAVE_OPENSSL && !defined(PK11_DH_DISABLE)
ATF_TP_ADD_TC(tp, isc_dh_computesecret);
#else
ATF_TP_ADD_TC(tp, untested);

19
lib/dns/tests/keytable_test.c
View File

@@ -18,8 +18,6 @@
#include <unistd.h>
#include <stdio.h>
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
#include <isc/base64.h>
#include <isc/buffer.h>
#include <isc/util.h>
@@ -698,24 +696,10 @@ ATF_TC_BODY(nta, tc) {
dns_test_end();
}
#else
#include <isc/util.h>
ATF_TC(untested);
ATF_TC_HEAD(untested, tc) {
atf_tc_set_md_var(tc, "descr", "skipping keytable test");
}
ATF_TC_BODY(untested, tc) {
UNUSED(tc);
atf_tc_skip("DNSSEC not available");
}
#endif
/*
* Main
*/
ATF_TP_ADD_TCS(tp) {
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
ATF_TP_ADD_TC(tp, add);
ATF_TP_ADD_TC(tp, delete);
ATF_TP_ADD_TC(tp, deletekeynode);
@@ -723,9 +707,6 @@ ATF_TP_ADD_TCS(tp) {
ATF_TP_ADD_TC(tp, issecuredomain);
ATF_TP_ADD_TC(tp, dump);
ATF_TP_ADD_TC(tp, nta);
#else
ATF_TP_ADD_TC(tp, untested);
#endif
return (atf_no_error());
}

15
lib/dns/tests/nsec3_test.c
View File

@@ -23,7 +23,6 @@
#include "dnstest.h"
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
/*
* Helper functions
*/
@@ -180,27 +179,13 @@ ATF_TC_BODY(nsec3param_salttotext, tc) {
dns_test_end();
}
#else
ATF_TC(untested);
ATF_TC_HEAD(untested, tc) {
atf_tc_set_md_var(tc, "descr", "skipping nsec3 test");
}
ATF_TC_BODY(untested, tc) {
UNUSED(tc);
atf_tc_skip("DNSSEC not available");
}
#endif
/*
* Main
*/
ATF_TP_ADD_TCS(tp) {
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
ATF_TP_ADD_TC(tp, max_iterations);
ATF_TP_ADD_TC(tp, nsec3param_salttotext);
#else
ATF_TP_ADD_TC(tp, untested);
#endif
return (atf_no_error());
}

17
lib/dns/tests/rsa_test.c
View File

@@ -28,8 +28,6 @@
#include "../dst_internal.h"
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
static unsigned char d[10] = {
0xa, 0x10, 0xbb, 0, 0xfe, 0x15, 0x1, 0x88, 0xcc, 0x7d
};
@@ -288,25 +286,12 @@ ATF_TC_BODY(isc_rsa_verify, tc) {
dst_key_free(&key);
dns_test_end();
}
#else
ATF_TC(untested);
ATF_TC_HEAD(untested, tc) {
atf_tc_set_md_var(tc, "descr", "skipping RSA test");
}
ATF_TC_BODY(untested, tc) {
UNUSED(tc);
atf_tc_skip("RSA not available");
}
#endif
/*
* Main
*/
ATF_TP_ADD_TCS(tp) {
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
ATF_TP_ADD_TC(tp, isc_rsa_verify);
#else
ATF_TP_ADD_TC(tp, untested);
#endif
return (atf_no_error());
}

15
lib/dns/tests/sigs_test.c
View File

@@ -17,7 +17,6 @@
#include <isc/util.h>
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
#include <string.h>
#include <dns/db.h>
@@ -457,23 +456,9 @@ ATF_TC_BODY(updatesigs, tc) {
dns_test_end();
}
#else
ATF_TC(untested);
ATF_TC_HEAD(untested, tc) {
atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
}
ATF_TC_BODY(untested, tc) {
UNUSED(tc);
atf_tc_skip("DNSSEC support not compiled in");
}
#endif
ATF_TP_ADD_TCS(tp) {
#if defined(OPENSSL) || defined(PKCS11CRYPTO)
ATF_TP_ADD_TC(tp, updatesigs);
#else
ATF_TP_ADD_TC(tp, untested);
#endif
return (atf_no_error());
}