From: Mark Andrews Date: Fri, 8 Jul 2022 00:57:55 +0000 (+1000) Subject: views: use $DEFAULT_ALGORITHM X-Git-Tag: v9.19.4~44^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86b29606c362f99604423791e15eeb1ae99cabfa;p=thirdparty%2Fbind9.git views: use $DEFAULT_ALGORITHM --- diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh index b4ebebeb079..e0cca838c0a 100644 --- a/bin/tests/system/views/setup.sh +++ b/bin/tests/system/views/setup.sh @@ -28,11 +28,11 @@ copy_setports ns5/named.conf.in ns5/named.conf # same source of "random" data and we want different keys for # internal and external instances of inline. # -$KEYGEN -K ns2/internal -a rsasha256 -q inline > /dev/null 2>&1 -$KEYGEN -K ns2/internal -a rsasha256 -qfk inline > /dev/null 2>&1 -k1=$($KEYGEN -K ns2/external -a rsasha256 -q inline 2> /dev/null) -k2=$($KEYGEN -K ns2/external -a rsasha256 -qfk inline 2> /dev/null) -$KEYGEN -K ns2/external -a rsasha256 -q inline > /dev/null 2>&1 -$KEYGEN -K ns2/external -a rsasha256 -qfk inline > /dev/null 2>&1 +$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -q inline > /dev/null 2>&1 +$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -qfk inline > /dev/null 2>&1 +k1=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline 2> /dev/null) +k2=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline 2> /dev/null) +$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline > /dev/null 2>&1 +$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline > /dev/null 2>&1 test -n "$k1" && rm -f ns2/external/"$k1".* test -n "$k2" && rm -f ns2/external/"$k2".*