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

Test the AES DNS Cookie algorithm only if available

Browse Source
This commit is contained in:
Ondřej Surý
2019-07-22 06:57:45 -04:00
parent a0f4e6d27e
commit 9feaf319b4
6 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
bin/tests/system/cookie/bad-cookie-badaes.conf → bin/tests/system/cookie/bad-cookie-badaes.conf.in
View File

2
bin/tests/system/cookie/clean.sh
View File

@@ -13,3 +13,5 @@ rm -f ns1/named_dump.db
rm -f ns*/named.memstats
rm -f ns*/named.run
rm -f ns*/named.lock
rm -f ./good-cookie-aes.conf
rm -f ./bad-cookie-badaes.conf

0
bin/tests/system/cookie/good-cookie-aes.conf → bin/tests/system/cookie/good-cookie-aes.conf.in
View File

5
bin/tests/system/cookie/setup.sh
View File

@@ -21,3 +21,8 @@ copy_setports ns5/named.conf.in ns5/named.conf
copy_setports ns6/named.conf.in ns6/named.conf
copy_setports ns7/named.conf.in ns7/named.conf
copy_setports ns8/named.conf.in ns8/named.conf
if ../feature-test --have-aes; then
cp good-cookie-aes.conf.in good-cookie-aes.conf
cp bad-cookie-badaes.conf.in bad-cookie-badaes.conf
fi

9
bin/tests/system/feature-test.c
View File

@@ -41,6 +41,7 @@ usage() {
fprintf(stderr, " --enable-filter-aaaa\n");
fprintf(stderr, " --gethostname\n");
fprintf(stderr, " --gssapi\n");
fprintf(stderr, " --have-aes\n");
fprintf(stderr, " --have-dlopen\n");
fprintf(stderr, " --have-geoip\n");
fprintf(stderr, " --have-geoip2\n");
@@ -114,6 +115,14 @@ main(int argc, char **argv) {
#endif
}
if (strcmp(argv[1], "--have-aes") == 0) {
#if defined(HAVE_OPENSSL_AES) || defined(HAVE_OPENSSL_EVP_AES)
return (0);
#else
return (1);
#endif
}
if (strcmp(argv[1], "--have-dlopen") == 0) {
#if defined(HAVE_DLOPEN) && defined(ISC_DLZ_DLOPEN)
return (0);

4
util/copyrights
View File

@@ -911,14 +911,14 @@
./bin/tests/system/common/root.hint ZONE 2000,2001,2004,2007,2016,2018,2019
./bin/tests/system/conf.sh.in SH 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019
./bin/tests/system/conf.sh.win32 SH 2016,2017,2018,2019
./bin/tests/system/cookie/bad-cookie-badaes.conf X 2019
./bin/tests/system/cookie/bad-cookie-badaes.conf.in X 2019
./bin/tests/system/cookie/bad-cookie-badhex.conf CONF-C 2014,2015,2016,2018,2019
./bin/tests/system/cookie/bad-cookie-badsha1.conf CONF-C 2017,2018,2019
./bin/tests/system/cookie/bad-cookie-badsha256.conf CONF-C 2017,2018,2019
./bin/tests/system/cookie/bad-cookie-badsiphash24.conf X 2019
./bin/tests/system/cookie/bad-cookie-toolong.conf CONF-C 2014,2015,2016,2018,2019
./bin/tests/system/cookie/clean.sh SH 2014,2015,2016,2018,2019
./bin/tests/system/cookie/good-cookie-aes.conf X 2019
./bin/tests/system/cookie/good-cookie-aes.conf.in X 2019
./bin/tests/system/cookie/good-cookie-sha1.conf CONF-C 2017,2018,2019
./bin/tests/system/cookie/good-cookie-sha256.conf CONF-C 2017,2018,2019
./bin/tests/system/cookie/good-cookie-siphash24.conf X 2019