]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Don't check algorithm support during configure step
authorTom Krizek <tkrizek@isc.org>
Wed, 16 Nov 2022 16:28:27 +0000 (17:28 +0100)
committerTom Krizek <tkrizek@isc.org>
Fri, 23 Dec 2022 11:37:48 +0000 (12:37 +0100)
The 9.16 version of ./configure calls bin/tests/system/cleanall.sh
unless --without-make-clean is used. The cleanall.sh script then
includes bin/tests/system/conf.sh, which includes
bin/tests/system/conf.sh.common. At that point, dnssec-keygen which is
used to detect algorithm support isn't compiled, so it can't be used.

More importantly, algorithm selection for system tests during the
./configure phase is irrelevant, so it can be safely skipped.

bin/tests/system/conf.sh.common

index 868bcfc351ade1b35b6d7376f75be8a339b82f5c..c337f465dd955207d83abe3a57b0fd6ffd8156cc 100644 (file)
@@ -305,10 +305,13 @@ send() {
 # There are multiple algoritms sets to choose from (see get_algorithms.py). To
 # override the default choice, set the ALGORITHM_SET env var (see mkeys system
 # test for example).
-if test -x "$PYTHON"; then
+if test -x "$PYTHON" && test -x "$KEYGEN"; then
     eval "$($PYTHON "$TOP_SRCDIR/bin/tests/system/get_algorithms.py")"
 else
-    # 9.16 workaround for our Windows CI which lacks Python
+    # 9.16 workarounds
+    #   - for ./configure which calls bin/tests/system/cleanall.sh, which
+    #     includes this file before $KEYGEN is compiled
+    #   - for our Windows CI which lacks Python
     DEFAULT_ALGORITHM=ECDSAP256SHA256
     DEFAULT_ALGORITHM_NUMBER=13
     DEFAULT_BITS=256