mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Convert hmac-sha256 references in system tests to DEFAULT_HMAC

Browse Source 
where a future change from hmac-sha256 would be applicable.  This
change involves dnssec, nsupdate and rndc system tests.
This commit is contained in:
Mark Andrews
2022-07-05 18:39:43 +10:00
parent ce324ae8ba
commit 19a7a1e557
14 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tests/system/cookie/ans9/ans.py
View File

@@ -45,8 +45,8 @@ def logquery(type, qname):
try: try:
keyring = dns.tsigkeyring.from_text( keyring = dns.tsigkeyring.from_text(
{ {
"foo": {"hmac-sha256", "aaaaaaaaaaaa"}, "foo": {os.getenv("DEFAULT_HMAC", "hmac-sha256"), "aaaaaaaaaaaa"},
"fake": {"hmac-sha256", "aaaaaaaaaaaa"}, "fake": {os.getenv("DEFAULT_HMAC", "hmac-sha256"), "aaaaaaaaaaaa"},
} }
) )
except: except:

2
bin/tests/system/cookie/ns1/named.conf.in
View File

@@ -18,7 +18,7 @@ key rndc_key {
key foo { key foo {
secret "aaaaaaaaaaaa"; secret "aaaaaaaaaaaa";
algorithm hmac-sha256; algorithm @DEFAULT_HMAC@;
}; };
server 10.53.0.10 { server 10.53.0.10 {

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

@@ -474,7 +474,7 @@ then
echo_i "check that TSIG test server is correctly configured ($n)" echo_i "check that TSIG test server is correctly configured ($n)"
ret=0 ret=0
pat="; COOKIE: ................................ (good)" pat="; COOKIE: ................................ (good)"
key=hmac-sha256:foo:aaaaaaaaaaaa key="${DEFAULT_HMAC}:foo:aaaaaaaaaaaa"
#UDP #UDP
$DIG $DIGOPTS @10.53.0.10 -y $key +notcp tsig. > dig.out.test$n.1 $DIG $DIGOPTS @10.53.0.10 -y $key +notcp tsig. > dig.out.test$n.1
grep "status: NOERROR" dig.out.test$n.1 > /dev/null || ret=1 grep "status: NOERROR" dig.out.test$n.1 > /dev/null || ret=1

2
bin/tests/system/dnssec/ns4/named5.conf.in
View File

@@ -35,5 +35,5 @@ controls {
key auth { key auth {
secret "1234abcd8765"; secret "1234abcd8765";
algorithm hmac-sha256; algorithm @DEFAULT_HMAC@;
}; };

2
bin/tests/system/nsupdate/ns9/named.conf.in
View File

@@ -32,7 +32,7 @@ key rndc_key {
key subkey { key subkey {
secret "1234abcd8765"; secret "1234abcd8765";
algorithm hmac-sha256; algorithm @DEFAULT_HMAC@;
}; };
controls { controls {

4
bin/tests/system/nsupdate/tests.sh
View File

@@ -739,7 +739,7 @@ n=`expr $n + 1`
ret=0 ret=0
echo_i "check 'grant' in deny name + grant subdomain ($n)" echo_i "check 'grant' in deny name + grant subdomain ($n)"
$NSUPDATE << EOF > nsupdate.out-$n 2>&1 || ret=1 $NSUPDATE << EOF > nsupdate.out-$n 2>&1 || ret=1
key hmac-sha256:subkey 1234abcd8765 key $DEFAULT_HMAC:subkey 1234abcd8765
server 10.53.0.9 ${PORT} server 10.53.0.9 ${PORT}
zone denyname.example zone denyname.example
update add foo.denyname.example 3600 IN TXT added update add foo.denyname.example 3600 IN TXT added
@@ -753,7 +753,7 @@ n=`expr $n + 1`
ret=0 ret=0
echo_i "check 'deny' in deny name + grant subdomain ($n)" echo_i "check 'deny' in deny name + grant subdomain ($n)"
$NSUPDATE << EOF > nsupdate.out-$n 2>&1 && ret=1 $NSUPDATE << EOF > nsupdate.out-$n 2>&1 && ret=1
key hmac-sha256:subkey 1234abcd8765 key $DEFAULT_HMAC:subkey 1234abcd8765
server 10.53.0.9 ${PORT} server 10.53.0.9 ${PORT}
zone denyname.example zone denyname.example
update add denyname.example 3600 IN TXT added update add denyname.example 3600 IN TXT added

7
bin/tests/system/rndc/clean.sh
View File

@@ -12,11 +12,15 @@
# information regarding copyright ownership. # information regarding copyright ownership.
rm -f dig.out.*.test* rm -f dig.out.*.test*
rm -f ns*/*.nta
rm -f ns*/managed-keys.bind* ns*/*.mkeys*
rm -f ns*/named.conf
rm -f ns*/named.lock rm -f ns*/named.lock
rm -f ns*/named.memstats rm -f ns*/named.memstats
rm -f ns*/named.run ns*/named.run.prev rm -f ns*/named.run ns*/named.run.prev
rm -f ns2/named.stats rm -f ns2/named.stats
rm -f ns2/nil.db ns2/other.db ns2/static.db ns2/*.jnl rm -f ns2/nil.db ns2/other.db ns2/static.db ns2/*.jnl
rm -f ns2/secondkey.conf
rm -f ns2/session.key rm -f ns2/session.key
rm -f ns3/named_dump.db* rm -f ns3/named_dump.db*
rm -f ns4/*.nta rm -f ns4/*.nta
@@ -25,9 +29,6 @@ rm -f ns4/key?.conf
rm -f ns6/huge.zone.db rm -f ns6/huge.zone.db
rm -f ns7/include.db ns7/test.db ns7/*.jnl rm -f ns7/include.db ns7/test.db ns7/*.jnl
rm -f ns7/named_dump.db* rm -f ns7/named_dump.db*
rm -f ns*/named.conf
rm -f nsupdate.out.*.test* rm -f nsupdate.out.*.test*
rm -f python.out.*.test* rm -f python.out.*.test*
rm -f rndc.out.*.test* rm -f rndc.out.*.test*
rm -f ns*/managed-keys.bind* ns*/*.mkeys*
rm -f ns*/*.nta

2
bin/tests/system/rndc/ns2/named.conf.in
View File

@@ -27,7 +27,7 @@ key rndc_key {
key secondkey { key secondkey {
secret "abcd1234abcd8765"; secret "abcd1234abcd8765";
algorithm hmac-sha256; algorithm @DEFAULT_HMAC@;
}; };
controls { controls {

2
bin/tests/system/rndc/ns2/secondkey.conf → bin/tests/system/rndc/ns2/secondkey.conf.in
View File

@@ -17,5 +17,5 @@ options {
key secondkey { key secondkey {
secret "abcd1234abcd8765"; secret "abcd1234abcd8765";
algorithm hmac-sha256; algorithm @DEFAULT_HMAC@;
}; };

2
bin/tests/system/rndc/ns3/named.conf.in
View File

@@ -25,7 +25,7 @@ key rndc_key {
key secondkey { key secondkey {
secret "abcd1234abcd8765"; secret "abcd1234abcd8765";
algorithm hmac-sha256; algorithm @DEFAULT_HMAC@;
}; };
controls { controls {

1
bin/tests/system/rndc/setup.sh
View File

@@ -34,6 +34,7 @@ awk 'END { for (i = 1; i <= '${size}'; i++)
printf "host%d IN A 10.53.0.6\n", i; }' < /dev/null >> ns6/huge.zone.db printf "host%d IN A 10.53.0.6\n", i; }' < /dev/null >> ns6/huge.zone.db
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns2/secondkey.conf.in ns2/secondkey.conf
copy_setports ns3/named.conf.in ns3/named.conf copy_setports ns3/named.conf.in ns3/named.conf
copy_setports ns4/named.conf.in ns4/named.conf copy_setports ns4/named.conf.in ns4/named.conf
copy_setports ns5/named.conf.in ns5/named.conf copy_setports ns5/named.conf.in ns5/named.conf

4
bin/tests/system/rrl/broken.conf → bin/tests/system/rrl/broken.conf.in
View File

@@ -38,9 +38,9 @@ options {
key rndc_key { key rndc_key {
secret "1234abcd8765"; secret "1234abcd8765";
algorithm hmac-sha256; algorithm @DEFAULT_HMAC@;
}; };
controls { controls {
inet 10.53.0.5 port 9953 allow { any; } keys { rndc_key; }; inet 10.53.0.5 port 9953 allow { any; } keys { rndc_key; };
}; };

9
bin/tests/system/rrl/clean.sh
View File

@@ -11,10 +11,11 @@
# Clean up after rrl tests. # Clean up after rrl tests.
rm -f dig.out* *mdig.out*
rm -f */named.memstats */named.run */named.stats */log-* */session.key rm -f */named.memstats */named.run */named.stats */log-* */session.key
rm -f ns3/bl*.db */*.jnl */*.core */*.pid rm -f broken.conf
rm -f ns*/named.lock
rm -f ns*/named.conf
rm -f broken.out rm -f broken.out
rm -f dig.out* *mdig.out*
rm -f ns*/managed-keys.bind* rm -f ns*/managed-keys.bind*
rm -f ns*/named.conf
rm -f ns*/named.lock
rm -f ns3/bl*.db */*.jnl */*.core */*.pid

1
bin/tests/system/rrl/setup.sh
View File

@@ -15,6 +15,7 @@
$SHELL clean.sh $SHELL clean.sh
copy_setports broken.conf.in broken.conf
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf copy_setports ns3/named.conf.in ns3/named.conf