upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-07-16 20:02:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Randomize algorithm selection for mkeys test

Browse source 
Use the ALGORITHM_SET option to use randomly selected default algorithm
in this test. Make sure the test works by using variables instead of
hard-coding values.

(cherry picked from commit f65f276f98)
This commit is contained in:
Tom Krizek 2022-10-26 16:20:57 +02:00
parent aa5453f5e5
commit 7324a7b5e4
No known key found for this signature in database
GPG key ID: 01623B9B652A20A7
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/tests/system/mkeys/setup.sh
View file

@ -12,8 +12,16 @@
# information regarding copyright ownership.
SYSTEMTESTTOP=..
export ALGORITHM_SET="ecc_default"
. $SYSTEMTESTTOP/conf.sh
# Ensure the selected algorithm set is okay.
if [ "$ALGORITHM_SET" = "error" ]; then
echofail "Algorithm selection failed." >&2
exit 1
fi
copy_setports ns1/named1.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

3
bin/tests/system/mkeys/tests.sh
View file

@ -14,6 +14,7 @@
set -e
SYSTEMTESTTOP=..
export ALGORITHM_SET="ecc_default"
#shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh"
@ -691,7 +692,7 @@ ret=0
# compare against the known key.
tathex=$(grep "query '_ta-[0-9a-f][0-9a-f]*/NULL/IN' approved" ns1/named.run | awk '{print $6; exit 0}' | sed -e 's/(_ta-\([0-9a-f][0-9a-f]*\)):/\1/') || true
tatkey=$($PERL -e 'printf("%d\n", hex(@ARGV[0]));' "$tathex")
realkey=$(rndccmd 10.53.0.2 secroots - | sed -n 's#.*SHA256/\([0-9][0-9]*\) ; .*managed.*#\1#p')
realkey=$(rndccmd 10.53.0.2 secroots - | sed -n "s#.*${DEFAULT_ALGORITHM}/\([0-9][0-9]*\) ; .*managed.*#\1#p")
[ "$tatkey" -eq "$realkey" ] || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))