Test the AES DNS Cookie algorithm only if available

diff --git a/bin/tests/system/cookie/bad-cookie-badaes.conf b/bin/tests/system/cookie/bad-cookie-badaes.conf.in
similarity index 100%
rename from bin/tests/system/cookie/bad-cookie-badaes.conf
rename to bin/tests/system/cookie/bad-cookie-badaes.conf.in

diff --git a/bin/tests/system/cookie/clean.sh b/bin/tests/system/cookie/clean.sh
index 01abbc8f6a69b0865f868097da052f3fc80f673c..eed42a264b65c53caa1f28e61dec62fd353a7951 100644 (file)
--- a/bin/tests/system/cookie/clean.sh
+++ b/bin/tests/system/cookie/clean.sh
@@ -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

diff --git a/bin/tests/system/cookie/good-cookie-aes.conf b/bin/tests/system/cookie/good-cookie-aes.conf.in
similarity index 100%
rename from bin/tests/system/cookie/good-cookie-aes.conf
rename to bin/tests/system/cookie/good-cookie-aes.conf.in

diff --git a/bin/tests/system/cookie/setup.sh b/bin/tests/system/cookie/setup.sh
index 7929f095450f8d722a415b3a86ca3ce5aaa8a877..f4b133502230fa25cf9be0fac10407812327eaf6 100644 (file)
--- a/bin/tests/system/cookie/setup.sh
+++ b/bin/tests/system/cookie/setup.sh
@@ -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

diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index 27a02d0b3abc7833f3eeeabc368d10d05dc67828..c1249ed62c14a650bfff8928c992828e6814f3e2 100644 (file)
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -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);

diff --git a/util/copyrights b/util/copyrights
index 991f81c97bfae2ab72a2d760ae4b5c21f1d57a3a..31477c1bc9b43cad751f6644ad7a540db74f8cba 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -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