From: Mark Andrews Date: Fri, 1 Jul 2022 06:11:02 +0000 (+1000) Subject: Use DEFAULT_HMAC for rndc X-Git-Tag: v9.19.3~4^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce324ae8bad4b4fcceadf5195d0768b801c86c3c;p=thirdparty%2Fbind9.git Use DEFAULT_HMAC for rndc --- diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in index 745048af406..8787c6afa2f 100644 --- a/bin/tests/system/acl/ns2/named1.conf.in +++ b/bin/tests/system/acl/ns2/named1.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in index 21aa991566a..a95b4c18dde 100644 --- a/bin/tests/system/acl/ns2/named2.conf.in +++ b/bin/tests/system/acl/ns2/named2.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in index 3208c920960..14cc3fec3f7 100644 --- a/bin/tests/system/acl/ns2/named3.conf.in +++ b/bin/tests/system/acl/ns2/named3.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in index 14e82ed2661..77cf110a546 100644 --- a/bin/tests/system/acl/ns2/named4.conf.in +++ b/bin/tests/system/acl/ns2/named4.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in index f43f33cba84..5ccabf9255b 100644 --- a/bin/tests/system/acl/ns2/named5.conf.in +++ b/bin/tests/system/acl/ns2/named5.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/acl/ns3/named.conf.in b/bin/tests/system/acl/ns3/named.conf.in index fceed385ae3..396b1a9eb1e 100644 --- a/bin/tests/system/acl/ns3/named.conf.in +++ b/bin/tests/system/acl/ns3/named.conf.in @@ -31,5 +31,5 @@ controls { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/acl/ns4/named.conf.in b/bin/tests/system/acl/ns4/named.conf.in index 6389c33b3c9..951c61e8f50 100644 --- a/bin/tests/system/acl/ns4/named.conf.in +++ b/bin/tests/system/acl/ns4/named.conf.in @@ -31,7 +31,7 @@ controls { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; zone "existing" { diff --git a/bin/tests/system/addzone/ns1/named.conf.in b/bin/tests/system/addzone/ns1/named.conf.in index afd7c316d7a..b2d5e05dbba 100644 --- a/bin/tests/system/addzone/ns1/named.conf.in +++ b/bin/tests/system/addzone/ns1/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/allow-query/ns3/named1.conf.in b/bin/tests/system/allow-query/ns3/named1.conf.in index 68af61f6f50..74b9885bcc3 100644 --- a/bin/tests/system/allow-query/ns3/named1.conf.in +++ b/bin/tests/system/allow-query/ns3/named1.conf.in @@ -22,7 +22,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/allow-query/ns3/named2.conf.in b/bin/tests/system/allow-query/ns3/named2.conf.in index d3f220512c1..c4a4e8fb88b 100644 --- a/bin/tests/system/allow-query/ns3/named2.conf.in +++ b/bin/tests/system/allow-query/ns3/named2.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/allow-query/ns3/named3.conf.in b/bin/tests/system/allow-query/ns3/named3.conf.in index 32e1e0d2b7f..0e1f7b02111 100644 --- a/bin/tests/system/allow-query/ns3/named3.conf.in +++ b/bin/tests/system/allow-query/ns3/named3.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/allow-query/ns3/named4.conf.in b/bin/tests/system/allow-query/ns3/named4.conf.in index e8ab737302b..36ff9114f30 100644 --- a/bin/tests/system/allow-query/ns3/named4.conf.in +++ b/bin/tests/system/allow-query/ns3/named4.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/autosign/ns1/named.conf.in b/bin/tests/system/autosign/ns1/named.conf.in index 6295404f269..2a5548349ff 100644 --- a/bin/tests/system/autosign/ns1/named.conf.in +++ b/bin/tests/system/autosign/ns1/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/autosign/ns2/named.conf.in b/bin/tests/system/autosign/ns2/named.conf.in index 460bf75c39a..32c565d6827 100644 --- a/bin/tests/system/autosign/ns2/named.conf.in +++ b/bin/tests/system/autosign/ns2/named.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in index 29dfad63120..21d3191c9f7 100644 --- a/bin/tests/system/autosign/ns3/named.conf.in +++ b/bin/tests/system/autosign/ns3/named.conf.in @@ -33,7 +33,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in index 554730e6aea..0b5cd29813c 100644 --- a/bin/tests/system/cacheclean/ns2/named.conf.in +++ b/bin/tests/system/cacheclean/ns2/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/chain/ns7/named.conf.in b/bin/tests/system/chain/ns7/named.conf.in index 31ca3ef5322..32c9b5f5699 100644 --- a/bin/tests/system/chain/ns7/named.conf.in +++ b/bin/tests/system/chain/ns7/named.conf.in @@ -32,7 +32,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/checkds/ns2/named.conf.in b/bin/tests/system/checkds/ns2/named.conf.in index 44a577617d4..8086055d755 100644 --- a/bin/tests/system/checkds/ns2/named.conf.in +++ b/bin/tests/system/checkds/ns2/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/checkds/ns4/named.conf.in b/bin/tests/system/checkds/ns4/named.conf.in index b5421eb1bea..84aabde4568 100644 --- a/bin/tests/system/checkds/ns4/named.conf.in +++ b/bin/tests/system/checkds/ns4/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/checkds/ns5/named.conf.in b/bin/tests/system/checkds/ns5/named.conf.in index baab6be82e5..2a306776cb0 100644 --- a/bin/tests/system/checkds/ns5/named.conf.in +++ b/bin/tests/system/checkds/ns5/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/checkds/ns6/named.conf.in b/bin/tests/system/checkds/ns6/named.conf.in index 53d3a167edf..90c80cce4ce 100644 --- a/bin/tests/system/checkds/ns6/named.conf.in +++ b/bin/tests/system/checkds/ns6/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/checkds/ns7/named.conf.in b/bin/tests/system/checkds/ns7/named.conf.in index a3e3e1527bf..9b966ccd059 100644 --- a/bin/tests/system/checkds/ns7/named.conf.in +++ b/bin/tests/system/checkds/ns7/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/checkds/ns9/named.conf.in b/bin/tests/system/checkds/ns9/named.conf.in index 8f0dfeab0d2..9942b68d8eb 100644 --- a/bin/tests/system/checkds/ns9/named.conf.in +++ b/bin/tests/system/checkds/ns9/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/common/controls.conf.in b/bin/tests/system/common/controls.conf.in index 371288560ad..1db9286eba2 100644 --- a/bin/tests/system/common/controls.conf.in +++ b/bin/tests/system/common/controls.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common index 53b88bcfc3f..d02ae5e7662 100644 --- a/bin/tests/system/conf.sh.common +++ b/bin/tests/system/conf.sh.common @@ -284,6 +284,7 @@ DISABLED_ALGORITHM_NUMBER=14 DISABLED_BITS=384 # Default HMAC algorithm. +# also update common/rndc.conf and common/rndc.key when updating DEFAULT_HMAC DEFAULT_HMAC=hmac-sha256 # diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.in index 129a9b1009d..130430326f7 100644 --- a/bin/tests/system/cookie/ns1/named.conf.in +++ b/bin/tests/system/cookie/ns1/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; key foo { diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.in index 8b2ad795714..03824745495 100644 --- a/bin/tests/system/cookie/ns3/named.conf.in +++ b/bin/tests/system/cookie/ns3/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/cookie/ns4/named.conf.in b/bin/tests/system/cookie/ns4/named.conf.in index 0b142721376..c49b87ec10a 100644 --- a/bin/tests/system/cookie/ns4/named.conf.in +++ b/bin/tests/system/cookie/ns4/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/cookie/ns5/named.conf.in b/bin/tests/system/cookie/ns5/named.conf.in index 2aabc5a8c3a..87210adbf8b 100644 --- a/bin/tests/system/cookie/ns5/named.conf.in +++ b/bin/tests/system/cookie/ns5/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/cookie/ns6/named.conf.in b/bin/tests/system/cookie/ns6/named.conf.in index 2bf37936a39..158d8988c5f 100644 --- a/bin/tests/system/cookie/ns6/named.conf.in +++ b/bin/tests/system/cookie/ns6/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/cookie/ns8/named.conf.in b/bin/tests/system/cookie/ns8/named.conf.in index 1a9697bafc4..99ff66b1a27 100644 --- a/bin/tests/system/cookie/ns8/named.conf.in +++ b/bin/tests/system/cookie/ns8/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/database/ns1/named1.conf.in b/bin/tests/system/database/ns1/named1.conf.in index 56c6a07d28e..5fa7ce5ce4d 100644 --- a/bin/tests/system/database/ns1/named1.conf.in +++ b/bin/tests/system/database/ns1/named1.conf.in @@ -15,7 +15,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/database/ns1/named2.conf.in b/bin/tests/system/database/ns1/named2.conf.in index 7eb49300005..80cfab28b88 100644 --- a/bin/tests/system/database/ns1/named2.conf.in +++ b/bin/tests/system/database/ns1/named2.conf.in @@ -15,7 +15,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/delzone/tests.sh b/bin/tests/system/delzone/tests.sh index 0cb22f57900..fcd687d5f8d 100755 --- a/bin/tests/system/delzone/tests.sh +++ b/bin/tests/system/delzone/tests.sh @@ -35,7 +35,7 @@ ret=0 import sys sys.path.insert(0, '../../../../bin/python') from isc import rndc -r = rndc(('10.53.0.2', 9953), 'hmac-sha256', '1234abcd8765') +r = rndc(('10.53.0.2', 9953), '${DEFAULT_HMAC}', '1234abcd8765') for i in range(20000): res = r.call('addzone z%d.example { type primary; file "added.db"; };' % i) if 'text' in res: @@ -48,7 +48,7 @@ EOF import sys sys.path.insert(0, '../../../../bin/python') from isc import rndc -r = rndc(('10.53.0.2', 9953), 'hmac-sha256', '1234abcd8765') +r = rndc(('10.53.0.2', 9953), '${DEFAULT_HMAC}', '1234abcd8765') for i in range(20000): res = r.call('delzone z%d.example' % i) if 'text' in res: diff --git a/bin/tests/system/dispatch/ns1/named.conf.in b/bin/tests/system/dispatch/ns1/named.conf.in index a4a2f612498..794312497e1 100644 --- a/bin/tests/system/dispatch/ns1/named.conf.in +++ b/bin/tests/system/dispatch/ns1/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dispatch/ns2/named.conf.in b/bin/tests/system/dispatch/ns2/named.conf.in index 231e5a6c324..8e79ac483d8 100644 --- a/bin/tests/system/dispatch/ns2/named.conf.in +++ b/bin/tests/system/dispatch/ns2/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in index 51a2f86f378..87f8a7fe326 100644 --- a/bin/tests/system/dlzexternal/ns1/named.conf.in +++ b/bin/tests/system/dlzexternal/ns1/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; include "ddns.key"; diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in index ebfde148724..94928c1f1d4 100644 --- a/bin/tests/system/dnssec/ns2/named.conf.in +++ b/bin/tests/system/dnssec/ns2/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in index 08875f953b8..cdc6e020073 100644 --- a/bin/tests/system/dnssec/ns3/named.conf.in +++ b/bin/tests/system/dnssec/ns3/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in index 212ef85666a..09a32921f1a 100644 --- a/bin/tests/system/dnssec/ns4/named1.conf.in +++ b/bin/tests/system/dnssec/ns4/named1.conf.in @@ -41,7 +41,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in index 3369b6bdf45..5742871a4f9 100644 --- a/bin/tests/system/dnssec/ns4/named2.conf.in +++ b/bin/tests/system/dnssec/ns4/named2.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns4/named3.conf.in b/bin/tests/system/dnssec/ns4/named3.conf.in index d6eaa014192..3a64e9d27ad 100644 --- a/bin/tests/system/dnssec/ns4/named3.conf.in +++ b/bin/tests/system/dnssec/ns4/named3.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns4/named4.conf.in b/bin/tests/system/dnssec/ns4/named4.conf.in index db42f234f24..5d3bf3f0c71 100644 --- a/bin/tests/system/dnssec/ns4/named4.conf.in +++ b/bin/tests/system/dnssec/ns4/named4.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { @@ -34,7 +34,7 @@ controls { key auth { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; include "trusted.conf"; diff --git a/bin/tests/system/dnssec/ns4/named5.conf.in b/bin/tests/system/dnssec/ns4/named5.conf.in index 2be2f0262c0..f1b817a75f8 100644 --- a/bin/tests/system/dnssec/ns4/named5.conf.in +++ b/bin/tests/system/dnssec/ns4/named5.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns5/named1.conf.in b/bin/tests/system/dnssec/ns5/named1.conf.in index deec9c218a6..ccb3de919c9 100644 --- a/bin/tests/system/dnssec/ns5/named1.conf.in +++ b/bin/tests/system/dnssec/ns5/named1.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns5/named2.conf.in b/bin/tests/system/dnssec/ns5/named2.conf.in index f334e168991..636f4c23fae 100644 --- a/bin/tests/system/dnssec/ns5/named2.conf.in +++ b/bin/tests/system/dnssec/ns5/named2.conf.in @@ -15,7 +15,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns8/named.conf.in b/bin/tests/system/dnssec/ns8/named.conf.in index ef3c91314f8..d0278caeb9d 100644 --- a/bin/tests/system/dnssec/ns8/named.conf.in +++ b/bin/tests/system/dnssec/ns8/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnssec/ns9/named.conf.in b/bin/tests/system/dnssec/ns9/named.conf.in index d206d565820..06530a08c1b 100644 --- a/bin/tests/system/dnssec/ns9/named.conf.in +++ b/bin/tests/system/dnssec/ns9/named.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnstap/ns1/named.conf.in b/bin/tests/system/dnstap/ns1/named.conf.in index c2c00877535..7f3fb296d76 100644 --- a/bin/tests/system/dnstap/ns1/named.conf.in +++ b/bin/tests/system/dnstap/ns1/named.conf.in @@ -34,7 +34,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnstap/ns2/named.conf.in b/bin/tests/system/dnstap/ns2/named.conf.in index 1c1713a46db..badc2257bbb 100644 --- a/bin/tests/system/dnstap/ns2/named.conf.in +++ b/bin/tests/system/dnstap/ns2/named.conf.in @@ -34,7 +34,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnstap/ns3/named.conf.in b/bin/tests/system/dnstap/ns3/named.conf.in index 24320ed83ff..a5ee2ede8b4 100644 --- a/bin/tests/system/dnstap/ns3/named.conf.in +++ b/bin/tests/system/dnstap/ns3/named.conf.in @@ -37,7 +37,7 @@ server 10.53.0.1 { tcp-only yes; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dnstap/ns4/named.conf.in b/bin/tests/system/dnstap/ns4/named.conf.in index e821f5ecd47..e2a9207d1fb 100644 --- a/bin/tests/system/dnstap/ns4/named.conf.in +++ b/bin/tests/system/dnstap/ns4/named.conf.in @@ -36,7 +36,7 @@ server 10.53.0.1 { tcp-only yes; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/dyndb/ns1/named.conf.in b/bin/tests/system/dyndb/ns1/named.conf.in index 4ab3f65328c..6bb76ea404e 100644 --- a/bin/tests/system/dyndb/ns1/named.conf.in +++ b/bin/tests/system/dyndb/ns1/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/emptyzones/ns1/named1.conf.in b/bin/tests/system/emptyzones/ns1/named1.conf.in index 2cf12866434..582b4fa636c 100644 --- a/bin/tests/system/emptyzones/ns1/named1.conf.in +++ b/bin/tests/system/emptyzones/ns1/named1.conf.in @@ -12,7 +12,7 @@ */ key rndc_key { - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; secret "1234abcd8765"; }; diff --git a/bin/tests/system/emptyzones/ns1/named2.conf.in b/bin/tests/system/emptyzones/ns1/named2.conf.in index f62cfc94973..8d8f0ff1c75 100644 --- a/bin/tests/system/emptyzones/ns1/named2.conf.in +++ b/bin/tests/system/emptyzones/ns1/named2.conf.in @@ -12,7 +12,7 @@ */ key rndc_key { - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; secret "1234abcd8765"; }; diff --git a/bin/tests/system/engine_pkcs11/ns1/named.conf.in b/bin/tests/system/engine_pkcs11/ns1/named.conf.in index 8f2687d5385..985974db81b 100644 --- a/bin/tests/system/engine_pkcs11/ns1/named.conf.in +++ b/bin/tests/system/engine_pkcs11/ns1/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.in b/bin/tests/system/fetchlimit/ns2/named.conf.in index 108877e3ad1..1d57632f3ad 100644 --- a/bin/tests/system/fetchlimit/ns2/named.conf.in +++ b/bin/tests/system/fetchlimit/ns2/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in index 3adfe473eb0..e493d8a4d77 100644 --- a/bin/tests/system/fetchlimit/ns3/named1.conf.in +++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in @@ -34,7 +34,7 @@ server 10.53.0.4 { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in index 74374b106f3..2d0dcef24bc 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.in +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in @@ -32,7 +32,7 @@ server 10.53.0.4 { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in index 3df353b07d1..f056fbbf7bf 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.in +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in @@ -32,7 +32,7 @@ server 10.53.0.4 { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter-aaaa/ns1/named1.conf.in index 619a28dee64..f5f09055126 100644 --- a/bin/tests/system/filter-aaaa/ns1/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns1/named1.conf.in @@ -34,7 +34,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter-aaaa/ns1/named2.conf.in index e131e044294..3152f96f0ef 100644 --- a/bin/tests/system/filter-aaaa/ns1/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns1/named2.conf.in @@ -32,7 +32,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns2/named1.conf.in b/bin/tests/system/filter-aaaa/ns2/named1.conf.in index 99e005e2fd9..2a1486d56ae 100644 --- a/bin/tests/system/filter-aaaa/ns2/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns2/named1.conf.in @@ -32,7 +32,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns2/named2.conf.in b/bin/tests/system/filter-aaaa/ns2/named2.conf.in index 171439d4560..4e5a1ef095c 100644 --- a/bin/tests/system/filter-aaaa/ns2/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns2/named2.conf.in @@ -32,7 +32,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns3/named1.conf.in b/bin/tests/system/filter-aaaa/ns3/named1.conf.in index d2172a99581..602859b7525 100644 --- a/bin/tests/system/filter-aaaa/ns3/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns3/named1.conf.in @@ -32,7 +32,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns3/named2.conf.in b/bin/tests/system/filter-aaaa/ns3/named2.conf.in index 87d8d2429ba..db449afb9ed 100644 --- a/bin/tests/system/filter-aaaa/ns3/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns3/named2.conf.in @@ -32,7 +32,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns4/named1.conf.in b/bin/tests/system/filter-aaaa/ns4/named1.conf.in index 0e237ad13c8..0aa30071e8b 100644 --- a/bin/tests/system/filter-aaaa/ns4/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns4/named1.conf.in @@ -32,7 +32,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns4/named2.conf.in b/bin/tests/system/filter-aaaa/ns4/named2.conf.in index d81ce0a710d..e534e54a809 100644 --- a/bin/tests/system/filter-aaaa/ns4/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns4/named2.conf.in @@ -32,7 +32,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/filter-aaaa/ns5/named.conf.in b/bin/tests/system/filter-aaaa/ns5/named.conf.in index 2b837cf9303..36380cd3215 100644 --- a/bin/tests/system/filter-aaaa/ns5/named.conf.in +++ b/bin/tests/system/filter-aaaa/ns5/named.conf.in @@ -37,7 +37,7 @@ plugin query "../../../../plugins/.libs/filter-aaaa.so" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/forward/ns3/named1.conf.in b/bin/tests/system/forward/ns3/named1.conf.in index 88f1eee9b4f..ffc0718bfc0 100644 --- a/bin/tests/system/forward/ns3/named1.conf.in +++ b/bin/tests/system/forward/ns3/named1.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/forward/ns3/named2.conf.in b/bin/tests/system/forward/ns3/named2.conf.in index b498e87be9f..986a60e02d2 100644 --- a/bin/tests/system/forward/ns3/named2.conf.in +++ b/bin/tests/system/forward/ns3/named2.conf.in @@ -30,7 +30,7 @@ include "trusted.conf"; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/forward/ns9/named1.conf.in b/bin/tests/system/forward/ns9/named1.conf.in index be9a43842f3..54fed8f761d 100644 --- a/bin/tests/system/forward/ns9/named1.conf.in +++ b/bin/tests/system/forward/ns9/named1.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/forward/ns9/named2.conf.in b/bin/tests/system/forward/ns9/named2.conf.in index 2c40b42a0cc..34f7eeae071 100644 --- a/bin/tests/system/forward/ns9/named2.conf.in +++ b/bin/tests/system/forward/ns9/named2.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/forward/ns9/named3.conf.in b/bin/tests/system/forward/ns9/named3.conf.in index 576f57c10b6..c07281fdd16 100644 --- a/bin/tests/system/forward/ns9/named3.conf.in +++ b/bin/tests/system/forward/ns9/named3.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/forward/ns9/named4.conf.in b/bin/tests/system/forward/ns9/named4.conf.in index 5cd7d84109d..c06b36133cb 100644 --- a/bin/tests/system/forward/ns9/named4.conf.in +++ b/bin/tests/system/forward/ns9/named4.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/conf/bad-regiondb.conf b/bin/tests/system/geoip2/conf/bad-regiondb.conf index aebdbed4ffa..62a93cdbd63 100644 --- a/bin/tests/system/geoip2/conf/bad-regiondb.conf +++ b/bin/tests/system/geoip2/conf/bad-regiondb.conf @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named1.conf.in b/bin/tests/system/geoip2/ns2/named1.conf.in index 8c5784a6731..2b01a5cd3c5 100644 --- a/bin/tests/system/geoip2/ns2/named1.conf.in +++ b/bin/tests/system/geoip2/ns2/named1.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named10.conf.in b/bin/tests/system/geoip2/ns2/named10.conf.in index da3f9cd221c..5cac0f728c1 100644 --- a/bin/tests/system/geoip2/ns2/named10.conf.in +++ b/bin/tests/system/geoip2/ns2/named10.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named11.conf.in b/bin/tests/system/geoip2/ns2/named11.conf.in index 578a484a3d8..b6d2a446245 100644 --- a/bin/tests/system/geoip2/ns2/named11.conf.in +++ b/bin/tests/system/geoip2/ns2/named11.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named12.conf.in b/bin/tests/system/geoip2/ns2/named12.conf.in index 9c90c79a731..25281649cb8 100644 --- a/bin/tests/system/geoip2/ns2/named12.conf.in +++ b/bin/tests/system/geoip2/ns2/named12.conf.in @@ -33,7 +33,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named2.conf.in b/bin/tests/system/geoip2/ns2/named2.conf.in index 5ca5fcf3273..c28f15bfdcd 100644 --- a/bin/tests/system/geoip2/ns2/named2.conf.in +++ b/bin/tests/system/geoip2/ns2/named2.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named3.conf.in b/bin/tests/system/geoip2/ns2/named3.conf.in index 295122ac20e..f3b35e5b123 100644 --- a/bin/tests/system/geoip2/ns2/named3.conf.in +++ b/bin/tests/system/geoip2/ns2/named3.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named4.conf.in b/bin/tests/system/geoip2/ns2/named4.conf.in index efdcaeb8033..7ccd2009176 100644 --- a/bin/tests/system/geoip2/ns2/named4.conf.in +++ b/bin/tests/system/geoip2/ns2/named4.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named5.conf.in b/bin/tests/system/geoip2/ns2/named5.conf.in index 675dc187885..ec0b3710f8c 100644 --- a/bin/tests/system/geoip2/ns2/named5.conf.in +++ b/bin/tests/system/geoip2/ns2/named5.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named6.conf.in b/bin/tests/system/geoip2/ns2/named6.conf.in index 456462f4e8c..b2bb0917c23 100644 --- a/bin/tests/system/geoip2/ns2/named6.conf.in +++ b/bin/tests/system/geoip2/ns2/named6.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named7.conf.in b/bin/tests/system/geoip2/ns2/named7.conf.in index b248e02b6f5..99b69608a7c 100644 --- a/bin/tests/system/geoip2/ns2/named7.conf.in +++ b/bin/tests/system/geoip2/ns2/named7.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named8.conf.in b/bin/tests/system/geoip2/ns2/named8.conf.in index 26660b5f610..4470ad6aca3 100644 --- a/bin/tests/system/geoip2/ns2/named8.conf.in +++ b/bin/tests/system/geoip2/ns2/named8.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/geoip2/ns2/named9.conf.in b/bin/tests/system/geoip2/ns2/named9.conf.in index 392879b9787..5aee39375f2 100644 --- a/bin/tests/system/geoip2/ns2/named9.conf.in +++ b/bin/tests/system/geoip2/ns2/named9.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/hooks/ns1/named.conf.in b/bin/tests/system/hooks/ns1/named.conf.in index fc385daf34d..956bf41ef44 100644 --- a/bin/tests/system/hooks/ns1/named.conf.in +++ b/bin/tests/system/hooks/ns1/named.conf.in @@ -28,7 +28,7 @@ plugin query "../driver/.libs/test-async.so"; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/ixfr/ns1/named.conf.in b/bin/tests/system/ixfr/ns1/named.conf.in index 497e2550836..65f152b471e 100644 --- a/bin/tests/system/ixfr/ns1/named.conf.in +++ b/bin/tests/system/ixfr/ns1/named.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/ixfr/ns3/named.conf.in b/bin/tests/system/ixfr/ns3/named.conf.in index 3ff936ed502..e9b96124240 100644 --- a/bin/tests/system/ixfr/ns3/named.conf.in +++ b/bin/tests/system/ixfr/ns3/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/ixfr/ns4/named.conf.in b/bin/tests/system/ixfr/ns4/named.conf.in index 934cbb6e4ca..925a28051b4 100644 --- a/bin/tests/system/ixfr/ns4/named.conf.in +++ b/bin/tests/system/ixfr/ns4/named.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/ixfr/ns5/named.conf.in b/bin/tests/system/ixfr/ns5/named.conf.in index b2bf6d5a21d..45d4f97bf4b 100644 --- a/bin/tests/system/ixfr/ns5/named.conf.in +++ b/bin/tests/system/ixfr/ns5/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/journal/ns1/named.conf.in b/bin/tests/system/journal/ns1/named.conf.in index c3e2843b97a..9f72a6f0847 100644 --- a/bin/tests/system/journal/ns1/named.conf.in +++ b/bin/tests/system/journal/ns1/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/journal/ns2/named.conf.in b/bin/tests/system/journal/ns2/named.conf.in index 4d58c284681..e7f185e7221 100644 --- a/bin/tests/system/journal/ns2/named.conf.in +++ b/bin/tests/system/journal/ns2/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/kasp/ns2/named.conf.in b/bin/tests/system/kasp/ns2/named.conf.in index 926bf849c40..df139cd139a 100644 --- a/bin/tests/system/kasp/ns2/named.conf.in +++ b/bin/tests/system/kasp/ns2/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/kasp/ns3/named.conf.in b/bin/tests/system/kasp/ns3/named.conf.in index 7b5ab8cf1b5..4815967511b 100644 --- a/bin/tests/system/kasp/ns3/named.conf.in +++ b/bin/tests/system/kasp/ns3/named.conf.in @@ -31,7 +31,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/kasp/ns4/named.conf.in b/bin/tests/system/kasp/ns4/named.conf.in index d03be886871..bea7ef67afd 100644 --- a/bin/tests/system/kasp/ns4/named.conf.in +++ b/bin/tests/system/kasp/ns4/named.conf.in @@ -15,7 +15,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/kasp/ns5/named.conf.in b/bin/tests/system/kasp/ns5/named.conf.in index 2131c2c2bbf..02b17732d69 100644 --- a/bin/tests/system/kasp/ns5/named.conf.in +++ b/bin/tests/system/kasp/ns5/named.conf.in @@ -15,7 +15,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/kasp/ns6/named.conf.in b/bin/tests/system/kasp/ns6/named.conf.in index 616e3328608..b258241185c 100644 --- a/bin/tests/system/kasp/ns6/named.conf.in +++ b/bin/tests/system/kasp/ns6/named.conf.in @@ -31,7 +31,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/kasp/ns6/named2.conf.in b/bin/tests/system/kasp/ns6/named2.conf.in index 82e2abca7e0..f421b5e6621 100644 --- a/bin/tests/system/kasp/ns6/named2.conf.in +++ b/bin/tests/system/kasp/ns6/named2.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/keepalive/ns1/named.conf.in b/bin/tests/system/keepalive/ns1/named.conf.in index 26cf4b3d546..696dc48f987 100644 --- a/bin/tests/system/keepalive/ns1/named.conf.in +++ b/bin/tests/system/keepalive/ns1/named.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/keepalive/ns2/named.conf.in b/bin/tests/system/keepalive/ns2/named.conf.in index befa96f8443..5fbd453f873 100644 --- a/bin/tests/system/keepalive/ns2/named.conf.in +++ b/bin/tests/system/keepalive/ns2/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/keepalive/ns3/named.conf.in b/bin/tests/system/keepalive/ns3/named.conf.in index b6b8073bec3..873617b6005 100644 --- a/bin/tests/system/keepalive/ns3/named.conf.in +++ b/bin/tests/system/keepalive/ns3/named.conf.in @@ -31,7 +31,7 @@ server 10.53.0.2 { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/keymgr2kasp/ns3/named.conf.in b/bin/tests/system/keymgr2kasp/ns3/named.conf.in index 5a71a87bbe2..c0f79f1a409 100644 --- a/bin/tests/system/keymgr2kasp/ns3/named.conf.in +++ b/bin/tests/system/keymgr2kasp/ns3/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/keymgr2kasp/ns3/named2.conf.in b/bin/tests/system/keymgr2kasp/ns3/named2.conf.in index 8d5aecb463e..c65560e6ab0 100644 --- a/bin/tests/system/keymgr2kasp/ns3/named2.conf.in +++ b/bin/tests/system/keymgr2kasp/ns3/named2.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/keymgr2kasp/ns4/named.conf.in b/bin/tests/system/keymgr2kasp/ns4/named.conf.in index 7f0c815bb04..3b0f9cb932d 100644 --- a/bin/tests/system/keymgr2kasp/ns4/named.conf.in +++ b/bin/tests/system/keymgr2kasp/ns4/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/keymgr2kasp/ns4/named2.conf.in b/bin/tests/system/keymgr2kasp/ns4/named2.conf.in index fc96b906045..e9b0ed8f7ce 100644 --- a/bin/tests/system/keymgr2kasp/ns4/named2.conf.in +++ b/bin/tests/system/keymgr2kasp/ns4/named2.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in index 4e9b8880392..5c4b1c400bc 100644 --- a/bin/tests/system/legacy/ns1/named1.conf.in +++ b/bin/tests/system/legacy/ns1/named1.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/logfileconfig/ns1/named.dirconf.in b/bin/tests/system/logfileconfig/ns1/named.dirconf.in index 12b3e962574..d6ee1346e76 100644 --- a/bin/tests/system/logfileconfig/ns1/named.dirconf.in +++ b/bin/tests/system/logfileconfig/ns1/named.dirconf.in @@ -39,5 +39,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.in b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.in index 2b4b1819d04..6ac14dfa6c6 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.in +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.in @@ -39,5 +39,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601.in b/bin/tests/system/logfileconfig/ns1/named.iso8601.in index 9d520ea5629..5a1bd5e31ea 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601.in +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601.in @@ -40,5 +40,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.pipeconf.in b/bin/tests/system/logfileconfig/ns1/named.pipeconf.in index 5497b62f10b..8f2ec63a443 100644 --- a/bin/tests/system/logfileconfig/ns1/named.pipeconf.in +++ b/bin/tests/system/logfileconfig/ns1/named.pipeconf.in @@ -39,5 +39,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.plain.in b/bin/tests/system/logfileconfig/ns1/named.plain.in index 53a1946374f..f31906b76c4 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plain.in +++ b/bin/tests/system/logfileconfig/ns1/named.plain.in @@ -46,5 +46,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.plainconf.in b/bin/tests/system/logfileconfig/ns1/named.plainconf.in index 8a70ca061c7..d8dd5f5ce1e 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plainconf.in +++ b/bin/tests/system/logfileconfig/ns1/named.plainconf.in @@ -30,5 +30,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.symconf.in b/bin/tests/system/logfileconfig/ns1/named.symconf.in index 5b30e5797aa..96033651d33 100644 --- a/bin/tests/system/logfileconfig/ns1/named.symconf.in +++ b/bin/tests/system/logfileconfig/ns1/named.symconf.in @@ -39,5 +39,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.tsconf.in b/bin/tests/system/logfileconfig/ns1/named.tsconf.in index 4b0f8af55f3..7f761951fed 100644 --- a/bin/tests/system/logfileconfig/ns1/named.tsconf.in +++ b/bin/tests/system/logfileconfig/ns1/named.tsconf.in @@ -48,5 +48,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited.in b/bin/tests/system/logfileconfig/ns1/named.unlimited.in index 506b49b3c64..f806eddd62e 100644 --- a/bin/tests/system/logfileconfig/ns1/named.unlimited.in +++ b/bin/tests/system/logfileconfig/ns1/named.unlimited.in @@ -48,5 +48,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.versconf.in b/bin/tests/system/logfileconfig/ns1/named.versconf.in index 3860ae8c31d..c30d8a376ed 100644 --- a/bin/tests/system/logfileconfig/ns1/named.versconf.in +++ b/bin/tests/system/logfileconfig/ns1/named.versconf.in @@ -48,5 +48,5 @@ controls { key rndc-key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/masterformat/ns1/named.conf.in b/bin/tests/system/masterformat/ns1/named.conf.in index 0b9b42eb567..28687feda40 100644 --- a/bin/tests/system/masterformat/ns1/named.conf.in +++ b/bin/tests/system/masterformat/ns1/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/masterformat/ns3/named.conf.in b/bin/tests/system/masterformat/ns3/named.conf.in index c53acaa0996..eca537d93ec 100644 --- a/bin/tests/system/masterformat/ns3/named.conf.in +++ b/bin/tests/system/masterformat/ns3/named.conf.in @@ -24,7 +24,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mirror/ns2/named.conf.in b/bin/tests/system/mirror/ns2/named.conf.in index 5df56c234b8..52999c53250 100644 --- a/bin/tests/system/mirror/ns2/named.conf.in +++ b/bin/tests/system/mirror/ns2/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mirror/ns3/named.conf.in b/bin/tests/system/mirror/ns3/named.conf.in index 58d8bd5a303..7bc8d5d854b 100644 --- a/bin/tests/system/mirror/ns3/named.conf.in +++ b/bin/tests/system/mirror/ns3/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns1/named1.conf.in b/bin/tests/system/mkeys/ns1/named1.conf.in index 1912ee184ec..a63b54b4d24 100644 --- a/bin/tests/system/mkeys/ns1/named1.conf.in +++ b/bin/tests/system/mkeys/ns1/named1.conf.in @@ -34,7 +34,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns1/named2.conf.in b/bin/tests/system/mkeys/ns1/named2.conf.in index 99ec781b52c..729251bb327 100644 --- a/bin/tests/system/mkeys/ns1/named2.conf.in +++ b/bin/tests/system/mkeys/ns1/named2.conf.in @@ -34,7 +34,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns1/named3.conf.in b/bin/tests/system/mkeys/ns1/named3.conf.in index e05965dc14c..0f5d11f110a 100644 --- a/bin/tests/system/mkeys/ns1/named3.conf.in +++ b/bin/tests/system/mkeys/ns1/named3.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns2/named.conf.in b/bin/tests/system/mkeys/ns2/named.conf.in index 2f823b8951c..1c77556f783 100644 --- a/bin/tests/system/mkeys/ns2/named.conf.in +++ b/bin/tests/system/mkeys/ns2/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns3/named.conf.in b/bin/tests/system/mkeys/ns3/named.conf.in index e6e19f54c34..928ce30809a 100644 --- a/bin/tests/system/mkeys/ns3/named.conf.in +++ b/bin/tests/system/mkeys/ns3/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns4/named.conf.in b/bin/tests/system/mkeys/ns4/named.conf.in index 6bbc6b7b94d..fc200ce282e 100644 --- a/bin/tests/system/mkeys/ns4/named.conf.in +++ b/bin/tests/system/mkeys/ns4/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns5/named.conf.in b/bin/tests/system/mkeys/ns5/named.conf.in index aec778f243b..167938c04ec 100644 --- a/bin/tests/system/mkeys/ns5/named.conf.in +++ b/bin/tests/system/mkeys/ns5/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns6/named.conf.in b/bin/tests/system/mkeys/ns6/named.conf.in index 50892fa3bbe..7e74c3820b2 100644 --- a/bin/tests/system/mkeys/ns6/named.conf.in +++ b/bin/tests/system/mkeys/ns6/named.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/mkeys/ns7/named.conf.in b/bin/tests/system/mkeys/ns7/named.conf.in index 2c0d69ed1bc..b50246a7746 100644 --- a/bin/tests/system/mkeys/ns7/named.conf.in +++ b/bin/tests/system/mkeys/ns7/named.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/notify/ns2/named.conf.in b/bin/tests/system/notify/ns2/named.conf.in index 13b37974409..44aac950137 100644 --- a/bin/tests/system/notify/ns2/named.conf.in +++ b/bin/tests/system/notify/ns2/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsec3/ns3/named.conf.in b/bin/tests/system/nsec3/ns3/named.conf.in index 33a17c013c5..67febf6a650 100644 --- a/bin/tests/system/nsec3/ns3/named.conf.in +++ b/bin/tests/system/nsec3/ns3/named.conf.in @@ -44,7 +44,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsec3/ns3/named2.conf.in b/bin/tests/system/nsec3/ns3/named2.conf.in index cfce6d99453..3af1f5e8d9f 100644 --- a/bin/tests/system/nsec3/ns3/named2.conf.in +++ b/bin/tests/system/nsec3/ns3/named2.conf.in @@ -44,7 +44,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in index 81d0c99af8e..2b67360c76c 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf.in +++ b/bin/tests/system/nsupdate/ns1/named.conf.in @@ -31,7 +31,7 @@ acl named-acl { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns10/named.conf.in b/bin/tests/system/nsupdate/ns10/named.conf.in index 68f8279200d..f28c90bded1 100644 --- a/bin/tests/system/nsupdate/ns10/named.conf.in +++ b/bin/tests/system/nsupdate/ns10/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in index f1a17356346..c85eef52c9a 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf.in +++ b/bin/tests/system/nsupdate/ns2/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns5/named.conf.in b/bin/tests/system/nsupdate/ns5/named.conf.in index c36777da64e..39dec512c4f 100644 --- a/bin/tests/system/nsupdate/ns5/named.conf.in +++ b/bin/tests/system/nsupdate/ns5/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns6/named.conf.in b/bin/tests/system/nsupdate/ns6/named.conf.in index cf4a5aa5f52..82bc015ce43 100644 --- a/bin/tests/system/nsupdate/ns6/named.conf.in +++ b/bin/tests/system/nsupdate/ns6/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns7/named.conf.in b/bin/tests/system/nsupdate/ns7/named.conf.in index 1297bae9d26..7a484c7f2e3 100644 --- a/bin/tests/system/nsupdate/ns7/named.conf.in +++ b/bin/tests/system/nsupdate/ns7/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns8/named.conf.in b/bin/tests/system/nsupdate/ns8/named.conf.in index ead3cfed4de..042ac468e36 100644 --- a/bin/tests/system/nsupdate/ns8/named.conf.in +++ b/bin/tests/system/nsupdate/ns8/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/nsupdate/ns9/named.conf.in b/bin/tests/system/nsupdate/ns9/named.conf.in index 2e28ed3776e..6a7ff88b1a6 100644 --- a/bin/tests/system/nsupdate/ns9/named.conf.in +++ b/bin/tests/system/nsupdate/ns9/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; key subkey { diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf.in b/bin/tests/system/nzd2nzf/ns1/named.conf.in index d8fc51fe19b..9b5bf3a82a1 100644 --- a/bin/tests/system/nzd2nzf/ns1/named.conf.in +++ b/bin/tests/system/nzd2nzf/ns1/named.conf.in @@ -23,7 +23,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/padding/ns1/named.conf.in b/bin/tests/system/padding/ns1/named.conf.in index 26cf4b3d546..696dc48f987 100644 --- a/bin/tests/system/padding/ns1/named.conf.in +++ b/bin/tests/system/padding/ns1/named.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/padding/ns2/named.conf.in b/bin/tests/system/padding/ns2/named.conf.in index 834471f7583..3f6e0d42c11 100644 --- a/bin/tests/system/padding/ns2/named.conf.in +++ b/bin/tests/system/padding/ns2/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/padding/ns3/named.conf.in b/bin/tests/system/padding/ns3/named.conf.in index cf9434f976a..9b7e123bfe0 100644 --- a/bin/tests/system/padding/ns3/named.conf.in +++ b/bin/tests/system/padding/ns3/named.conf.in @@ -31,7 +31,7 @@ server 10.53.0.2 { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/padding/ns4/named.conf.in b/bin/tests/system/padding/ns4/named.conf.in index 9a1651e0bb2..79b7f72c7a5 100644 --- a/bin/tests/system/padding/ns4/named.conf.in +++ b/bin/tests/system/padding/ns4/named.conf.in @@ -31,7 +31,7 @@ server 10.53.0.2 { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/pipelined/ns1/named.conf.in b/bin/tests/system/pipelined/ns1/named.conf.in index 848a0228cb4..6cfac77c020 100644 --- a/bin/tests/system/pipelined/ns1/named.conf.in +++ b/bin/tests/system/pipelined/ns1/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.in index 40ed7b9157f..3679e97b12f 100644 --- a/bin/tests/system/pipelined/ns2/named.conf.in +++ b/bin/tests/system/pipelined/ns2/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.in index 428da7d41a0..d8943d5b639 100644 --- a/bin/tests/system/pipelined/ns3/named.conf.in +++ b/bin/tests/system/pipelined/ns3/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.in index cfd0fd213c5..e7d07e99e3f 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.in +++ b/bin/tests/system/pipelined/ns4/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/qmin/ns5/named.conf.in b/bin/tests/system/qmin/ns5/named.conf.in index 11400c9748f..d84d818a6e1 100644 --- a/bin/tests/system/qmin/ns5/named.conf.in +++ b/bin/tests/system/qmin/ns5/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/qmin/ns6/named.conf.in b/bin/tests/system/qmin/ns6/named.conf.in index 8269d2519fa..828973cef51 100644 --- a/bin/tests/system/qmin/ns6/named.conf.in +++ b/bin/tests/system/qmin/ns6/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/qmin/ns7/named.conf.in b/bin/tests/system/qmin/ns7/named.conf.in index 6646bea5d07..8ca32750e39 100644 --- a/bin/tests/system/qmin/ns7/named.conf.in +++ b/bin/tests/system/qmin/ns7/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/reclimit/ns3/named1.conf.in b/bin/tests/system/reclimit/ns3/named1.conf.in index 3eaaf6a2c3c..58b5d025144 100644 --- a/bin/tests/system/reclimit/ns3/named1.conf.in +++ b/bin/tests/system/reclimit/ns3/named1.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/reclimit/ns3/named2.conf.in b/bin/tests/system/reclimit/ns3/named2.conf.in index 12bf35fbf9a..b5389f4ff9f 100644 --- a/bin/tests/system/reclimit/ns3/named2.conf.in +++ b/bin/tests/system/reclimit/ns3/named2.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/reclimit/ns3/named3.conf.in b/bin/tests/system/reclimit/ns3/named3.conf.in index 0910f948537..f356f2487f9 100644 --- a/bin/tests/system/reclimit/ns3/named3.conf.in +++ b/bin/tests/system/reclimit/ns3/named3.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/reclimit/ns3/named4.conf.in b/bin/tests/system/reclimit/ns3/named4.conf.in index 84b5f4b187b..728f00bb26c 100644 --- a/bin/tests/system/reclimit/ns3/named4.conf.in +++ b/bin/tests/system/reclimit/ns3/named4.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in index 9e8cbdefe43..9b887360d85 100644 --- a/bin/tests/system/redirect/ns2/named.conf.in +++ b/bin/tests/system/redirect/ns2/named.conf.in @@ -33,7 +33,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/redirect/ns4/named.conf.in b/bin/tests/system/redirect/ns4/named.conf.in index 698d5a49262..1650e99a7bf 100644 --- a/bin/tests/system/redirect/ns4/named.conf.in +++ b/bin/tests/system/redirect/ns4/named.conf.in @@ -33,7 +33,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/resolver/ns4/named.conf.in b/bin/tests/system/resolver/ns4/named.conf.in index 75c9c53d026..2fe6fbbf7d8 100644 --- a/bin/tests/system/resolver/ns4/named.conf.in +++ b/bin/tests/system/resolver/ns4/named.conf.in @@ -59,7 +59,7 @@ zone "sourcens" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in index eada94cede4..c6344ad1984 100644 --- a/bin/tests/system/resolver/ns5/named.conf.in +++ b/bin/tests/system/resolver/ns5/named.conf.in @@ -52,7 +52,7 @@ zone "delegation-only" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/resolver/ns6/named.conf.in b/bin/tests/system/resolver/ns6/named.conf.in index 4fef5ba6863..4f9145923b2 100644 --- a/bin/tests/system/resolver/ns6/named.conf.in +++ b/bin/tests/system/resolver/ns6/named.conf.in @@ -84,7 +84,7 @@ zone "targetns" { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in index 8c64f63a975..7af5345f8fa 100644 --- a/bin/tests/system/resolver/ns7/named1.conf.in +++ b/bin/tests/system/resolver/ns7/named1.conf.in @@ -36,7 +36,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in index 8c64f63a975..7af5345f8fa 100644 --- a/bin/tests/system/resolver/ns7/named2.conf.in +++ b/bin/tests/system/resolver/ns7/named2.conf.in @@ -36,7 +36,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rndc/ns2/named.conf.in b/bin/tests/system/rndc/ns2/named.conf.in index 1af53466448..117a5f4f1a0 100644 --- a/bin/tests/system/rndc/ns2/named.conf.in +++ b/bin/tests/system/rndc/ns2/named.conf.in @@ -22,7 +22,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; key secondkey { diff --git a/bin/tests/system/rndc/ns3/named.conf.in b/bin/tests/system/rndc/ns3/named.conf.in index 378ab67efdc..3078e9003db 100644 --- a/bin/tests/system/rndc/ns3/named.conf.in +++ b/bin/tests/system/rndc/ns3/named.conf.in @@ -20,7 +20,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; key secondkey { diff --git a/bin/tests/system/rndc/ns5/named.conf.in b/bin/tests/system/rndc/ns5/named.conf.in index ef38b17cdff..66814297562 100644 --- a/bin/tests/system/rndc/ns5/named.conf.in +++ b/bin/tests/system/rndc/ns5/named.conf.in @@ -21,7 +21,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rndc/ns6/named.conf.in b/bin/tests/system/rndc/ns6/named.conf.in index 5c35741b8a2..3b09f41668a 100644 --- a/bin/tests/system/rndc/ns6/named.conf.in +++ b/bin/tests/system/rndc/ns6/named.conf.in @@ -21,7 +21,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rndc/ns7/named.conf.in b/bin/tests/system/rndc/ns7/named.conf.in index b72122353a5..ce8ea75c927 100644 --- a/bin/tests/system/rndc/ns7/named.conf.in +++ b/bin/tests/system/rndc/ns7/named.conf.in @@ -20,7 +20,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; key int { diff --git a/bin/tests/system/rpz/ns1/named.conf.in b/bin/tests/system/rpz/ns1/named.conf.in index 439ecfff4f1..4cf402e244f 100644 --- a/bin/tests/system/rpz/ns1/named.conf.in +++ b/bin/tests/system/rpz/ns1/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpz/ns10/named.conf.in b/bin/tests/system/rpz/ns10/named.conf.in index b34ce79bb42..d645e381c7a 100644 --- a/bin/tests/system/rpz/ns10/named.conf.in +++ b/bin/tests/system/rpz/ns10/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.10 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/rpz/ns2/named.conf.in b/bin/tests/system/rpz/ns2/named.conf.in index 1dde354562d..9b2ab3a81f0 100644 --- a/bin/tests/system/rpz/ns2/named.conf.in +++ b/bin/tests/system/rpz/ns2/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in index 30f08c804c8..aafe7f20f45 100644 --- a/bin/tests/system/rpz/ns3/named.conf.in +++ b/bin/tests/system/rpz/ns3/named.conf.in @@ -68,7 +68,7 @@ logging { category rpz { default_debug; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/rpz/ns4/named.conf.in b/bin/tests/system/rpz/ns4/named.conf.in index e2a954601ee..909f1c63aac 100644 --- a/bin/tests/system/rpz/ns4/named.conf.in +++ b/bin/tests/system/rpz/ns4/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpz/ns5/named.conf.in b/bin/tests/system/rpz/ns5/named.conf.in index a67a17f844f..e1f8fb60566 100644 --- a/bin/tests/system/rpz/ns5/named.conf.in +++ b/bin/tests/system/rpz/ns5/named.conf.in @@ -40,7 +40,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/rpz/ns6/named.conf.in b/bin/tests/system/rpz/ns6/named.conf.in index 3c4fbe958fa..d5fa2c46a80 100644 --- a/bin/tests/system/rpz/ns6/named.conf.in +++ b/bin/tests/system/rpz/ns6/named.conf.in @@ -42,7 +42,7 @@ logging { category rpz { default_debug; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpz/ns7/named.conf.in b/bin/tests/system/rpz/ns7/named.conf.in index 416db4d19ba..7effd3db41f 100644 --- a/bin/tests/system/rpz/ns7/named.conf.in +++ b/bin/tests/system/rpz/ns7/named.conf.in @@ -39,7 +39,7 @@ logging { category rpz { default_debug; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpz/ns8/named.conf.in b/bin/tests/system/rpz/ns8/named.conf.in index f228c006193..aa8b342d99d 100644 --- a/bin/tests/system/rpz/ns8/named.conf.in +++ b/bin/tests/system/rpz/ns8/named.conf.in @@ -50,7 +50,7 @@ logging { category rpz { default_debug; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/rpz/ns9/named.conf.in b/bin/tests/system/rpz/ns9/named.conf.in index e57591ccdf0..70297bdeba2 100644 --- a/bin/tests/system/rpz/ns9/named.conf.in +++ b/bin/tests/system/rpz/ns9/named.conf.in @@ -44,7 +44,7 @@ logging { category rpz { default_debug; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/rpzextra/ns1/named.conf.in b/bin/tests/system/rpzextra/ns1/named.conf.in index fe816823572..202ffa70066 100644 --- a/bin/tests/system/rpzextra/ns1/named.conf.in +++ b/bin/tests/system/rpzextra/ns1/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpzextra/ns2/named.conf.in b/bin/tests/system/rpzextra/ns2/named.conf.in index 8f0193db70b..17295efc01f 100644 --- a/bin/tests/system/rpzextra/ns2/named.conf.in +++ b/bin/tests/system/rpzextra/ns2/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.in b/bin/tests/system/rpzrecurse/ns1/named.conf.in index 14d749acd8a..4fbb35ac575 100644 --- a/bin/tests/system/rpzrecurse/ns1/named.conf.in +++ b/bin/tests/system/rpzrecurse/ns1/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in index 8e08ae615c1..2fb16788aab 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in +++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in @@ -32,7 +32,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.in b/bin/tests/system/rpzrecurse/ns4/named.conf.in index 3b3787deb7d..b8d87b93281 100644 --- a/bin/tests/system/rpzrecurse/ns4/named.conf.in +++ b/bin/tests/system/rpzrecurse/ns4/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.in index 987d42f481e..abe4f9cea39 100644 --- a/bin/tests/system/rrl/ns2/named.conf.in +++ b/bin/tests/system/rrl/ns2/named.conf.in @@ -38,7 +38,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/rrl/ns4/named.conf.in b/bin/tests/system/rrl/ns4/named.conf.in index cc17b916e49..3cd598e63b1 100644 --- a/bin/tests/system/rrl/ns4/named.conf.in +++ b/bin/tests/system/rrl/ns4/named.conf.in @@ -40,7 +40,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/runtime/ns2/named1.conf.in b/bin/tests/system/runtime/ns2/named1.conf.in index b389863d4d1..d8b31489cd9 100644 --- a/bin/tests/system/runtime/ns2/named1.conf.in +++ b/bin/tests/system/runtime/ns2/named1.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns1/named1.conf.in b/bin/tests/system/serve-stale/ns1/named1.conf.in index c0dd5b89112..a895195be74 100644 --- a/bin/tests/system/serve-stale/ns1/named1.conf.in +++ b/bin/tests/system/serve-stale/ns1/named1.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns1/named2.conf.in b/bin/tests/system/serve-stale/ns1/named2.conf.in index c1579031fb1..2696a2b6b36 100644 --- a/bin/tests/system/serve-stale/ns1/named2.conf.in +++ b/bin/tests/system/serve-stale/ns1/named2.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns1/named3.conf.in b/bin/tests/system/serve-stale/ns1/named3.conf.in index 985cddb6f92..846c60c4d2c 100644 --- a/bin/tests/system/serve-stale/ns1/named3.conf.in +++ b/bin/tests/system/serve-stale/ns1/named3.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns1/named4.conf.in b/bin/tests/system/serve-stale/ns1/named4.conf.in index 263baa095c8..139f68ec678 100644 --- a/bin/tests/system/serve-stale/ns1/named4.conf.in +++ b/bin/tests/system/serve-stale/ns1/named4.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named1.conf.in b/bin/tests/system/serve-stale/ns3/named1.conf.in index 4bc5de915d7..9b6ebc78917 100644 --- a/bin/tests/system/serve-stale/ns3/named1.conf.in +++ b/bin/tests/system/serve-stale/ns3/named1.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named2.conf.in b/bin/tests/system/serve-stale/ns3/named2.conf.in index 777133d6088..8b855833d46 100644 --- a/bin/tests/system/serve-stale/ns3/named2.conf.in +++ b/bin/tests/system/serve-stale/ns3/named2.conf.in @@ -17,7 +17,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named3.conf.in b/bin/tests/system/serve-stale/ns3/named3.conf.in index 98fff793b05..cef5e527679 100644 --- a/bin/tests/system/serve-stale/ns3/named3.conf.in +++ b/bin/tests/system/serve-stale/ns3/named3.conf.in @@ -17,7 +17,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named4.conf.in b/bin/tests/system/serve-stale/ns3/named4.conf.in index 21801b4b680..120aa48c7ea 100644 --- a/bin/tests/system/serve-stale/ns3/named4.conf.in +++ b/bin/tests/system/serve-stale/ns3/named4.conf.in @@ -17,7 +17,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named5.conf.in b/bin/tests/system/serve-stale/ns3/named5.conf.in index f7c51286aa5..b695901413d 100644 --- a/bin/tests/system/serve-stale/ns3/named5.conf.in +++ b/bin/tests/system/serve-stale/ns3/named5.conf.in @@ -17,7 +17,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named6.conf.in b/bin/tests/system/serve-stale/ns3/named6.conf.in index 6fa3fbf851d..add8d1a5949 100644 --- a/bin/tests/system/serve-stale/ns3/named6.conf.in +++ b/bin/tests/system/serve-stale/ns3/named6.conf.in @@ -17,7 +17,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named7.conf.in b/bin/tests/system/serve-stale/ns3/named7.conf.in index 3dba2eeb8fa..12d9ee38bc3 100644 --- a/bin/tests/system/serve-stale/ns3/named7.conf.in +++ b/bin/tests/system/serve-stale/ns3/named7.conf.in @@ -17,7 +17,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns3/named8.conf.in b/bin/tests/system/serve-stale/ns3/named8.conf.in index a292b5af406..cfa60bdad3b 100644 --- a/bin/tests/system/serve-stale/ns3/named8.conf.in +++ b/bin/tests/system/serve-stale/ns3/named8.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns4/named.conf.in b/bin/tests/system/serve-stale/ns4/named.conf.in index dbec7fde838..85640d8331a 100644 --- a/bin/tests/system/serve-stale/ns4/named.conf.in +++ b/bin/tests/system/serve-stale/ns4/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/serve-stale/ns5/named.conf.in b/bin/tests/system/serve-stale/ns5/named.conf.in index fb2694e3769..74d2156da31 100644 --- a/bin/tests/system/serve-stale/ns5/named.conf.in +++ b/bin/tests/system/serve-stale/ns5/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/sfcache/ns2/named.conf.in b/bin/tests/system/sfcache/ns2/named.conf.in index 2ec6675c011..afb5a86212a 100644 --- a/bin/tests/system/sfcache/ns2/named.conf.in +++ b/bin/tests/system/sfcache/ns2/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/sfcache/ns5/named.conf.in b/bin/tests/system/sfcache/ns5/named.conf.in index df3938be1ef..272d65b515b 100644 --- a/bin/tests/system/sfcache/ns5/named.conf.in +++ b/bin/tests/system/sfcache/ns5/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/shutdown/ns1/named.conf.in b/bin/tests/system/shutdown/ns1/named.conf.in index 05e6d849940..f0f5210b301 100644 --- a/bin/tests/system/shutdown/ns1/named.conf.in +++ b/bin/tests/system/shutdown/ns1/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/shutdown/ns2/named.conf.in b/bin/tests/system/shutdown/ns2/named.conf.in index c041a5b3f39..2ed91dc86b1 100644 --- a/bin/tests/system/shutdown/ns2/named.conf.in +++ b/bin/tests/system/shutdown/ns2/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/shutdown/resolver/named.conf.in b/bin/tests/system/shutdown/resolver/named.conf.in index f8444e33c04..5007579d330 100644 --- a/bin/tests/system/shutdown/resolver/named.conf.in +++ b/bin/tests/system/shutdown/resolver/named.conf.in @@ -19,9 +19,10 @@ logging { }; category default { basic; }; }; + key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/staticstub/ns2/named.conf.in b/bin/tests/system/staticstub/ns2/named.conf.in index 0724607b32d..55483ab0ecf 100644 --- a/bin/tests/system/staticstub/ns2/named.conf.in +++ b/bin/tests/system/staticstub/ns2/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in index cbff743d169..e6e49c37089 100644 --- a/bin/tests/system/staticstub/ns3/named.conf.in +++ b/bin/tests/system/staticstub/ns3/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/statistics/ns2/named.conf.in b/bin/tests/system/statistics/ns2/named.conf.in index 4e020378fb1..48fb8b481ff 100644 --- a/bin/tests/system/statistics/ns2/named.conf.in +++ b/bin/tests/system/statistics/ns2/named.conf.in @@ -30,7 +30,7 @@ statistics-channels { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/statistics/ns2/named2.conf.in b/bin/tests/system/statistics/ns2/named2.conf.in index f2deebf11ba..1187e10b825 100644 --- a/bin/tests/system/statistics/ns2/named2.conf.in +++ b/bin/tests/system/statistics/ns2/named2.conf.in @@ -29,7 +29,7 @@ statistics-channels { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/statistics/ns3/named.conf.in b/bin/tests/system/statistics/ns3/named.conf.in index 97021f002d0..4cc712d46b9 100644 --- a/bin/tests/system/statistics/ns3/named.conf.in +++ b/bin/tests/system/statistics/ns3/named.conf.in @@ -33,7 +33,7 @@ statistics-channels { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/statschannel/ns1/named.conf.in b/bin/tests/system/statschannel/ns1/named.conf.in index 04ead3325c8..5781886e397 100644 --- a/bin/tests/system/statschannel/ns1/named.conf.in +++ b/bin/tests/system/statschannel/ns1/named.conf.in @@ -29,7 +29,7 @@ statistics-channels { inet 10.53.0.1 port @EXTRAPORT1@ allow { localhost; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/statschannel/ns2/named.conf.in b/bin/tests/system/statschannel/ns2/named.conf.in index fd25fff4a7e..d1445edd322 100644 --- a/bin/tests/system/statschannel/ns2/named.conf.in +++ b/bin/tests/system/statschannel/ns2/named.conf.in @@ -29,7 +29,7 @@ statistics-channels { inet 10.53.0.2 port @EXTRAPORT1@ allow { localhost; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/statschannel/ns2/named2.conf.in b/bin/tests/system/statschannel/ns2/named2.conf.in index d45f9f58730..65be7a63db9 100644 --- a/bin/tests/system/statschannel/ns2/named2.conf.in +++ b/bin/tests/system/statschannel/ns2/named2.conf.in @@ -29,7 +29,7 @@ statistics-channels { inet 10.53.0.2 port @EXTRAPORT1@ allow { localhost; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/statschannel/ns3/named.conf.in b/bin/tests/system/statschannel/ns3/named.conf.in index 5f08c3ffaaf..bfd5a8e467f 100644 --- a/bin/tests/system/statschannel/ns3/named.conf.in +++ b/bin/tests/system/statschannel/ns3/named.conf.in @@ -29,7 +29,7 @@ statistics-channels { inet 10.53.0.3 port @EXTRAPORT1@ allow { localhost; }; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf index 8894493ba66..d4f331c4ce2 100644 --- a/bin/tests/system/stress/ns3/named.conf +++ b/bin/tests/system/stress/ns3/named.conf @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.in b/bin/tests/system/synthfromdnssec/ns1/named.conf.in index 7d25a1371ac..9a86e24acc0 100644 --- a/bin/tests/system/synthfromdnssec/ns1/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.in b/bin/tests/system/synthfromdnssec/ns2/named.conf.in index cc303072a28..f4b5059c44c 100644 --- a/bin/tests/system/synthfromdnssec/ns2/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.in b/bin/tests/system/synthfromdnssec/ns3/named.conf.in index 20fcf2ff599..874143a5438 100644 --- a/bin/tests/system/synthfromdnssec/ns3/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.in b/bin/tests/system/synthfromdnssec/ns4/named.conf.in index 2dbc9d0a403..780562ffcd8 100644 --- a/bin/tests/system/synthfromdnssec/ns4/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.in b/bin/tests/system/synthfromdnssec/ns5/named.conf.in index 885708c767c..42495488c20 100644 --- a/bin/tests/system/synthfromdnssec/ns5/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/synthfromdnssec/ns6/named.conf.in b/bin/tests/system/synthfromdnssec/ns6/named.conf.in index 0ef4650484f..c10e0f70e25 100644 --- a/bin/tests/system/synthfromdnssec/ns6/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns6/named.conf.in @@ -29,7 +29,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tcp/ns1/named.conf.in b/bin/tests/system/tcp/ns1/named.conf.in index 24c87468a9d..c042f6a301a 100644 --- a/bin/tests/system/tcp/ns1/named.conf.in +++ b/bin/tests/system/tcp/ns1/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tcp/ns2/named.conf.in b/bin/tests/system/tcp/ns2/named.conf.in index 57378003310..75f039af668 100644 --- a/bin/tests/system/tcp/ns2/named.conf.in +++ b/bin/tests/system/tcp/ns2/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tcp/ns3/named.conf.in b/bin/tests/system/tcp/ns3/named.conf.in index 5b3b982de12..7e2ba8b23d8 100644 --- a/bin/tests/system/tcp/ns3/named.conf.in +++ b/bin/tests/system/tcp/ns3/named.conf.in @@ -28,7 +28,7 @@ server 10.53.0.1 { tcp-only yes; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tcp/ns4/named.conf.in b/bin/tests/system/tcp/ns4/named.conf.in index a7a0546ff8c..3d4c770d073 100644 --- a/bin/tests/system/tcp/ns4/named.conf.in +++ b/bin/tests/system/tcp/ns4/named.conf.in @@ -30,7 +30,7 @@ server 10.53.0.2 { tcp-only yes; }; key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tcp/ns5/named.conf.in b/bin/tests/system/tcp/ns5/named.conf.in index 7827d9db21b..bd754f714b0 100644 --- a/bin/tests/system/tcp/ns5/named.conf.in +++ b/bin/tests/system/tcp/ns5/named.conf.in @@ -15,7 +15,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tcp/ns7/named.conf.in b/bin/tests/system/tcp/ns7/named.conf.in index fcaeecfe120..1103fce7209 100644 --- a/bin/tests/system/tcp/ns7/named.conf.in +++ b/bin/tests/system/tcp/ns7/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in index a2e371c3ff0..0fd784a6669 100644 --- a/bin/tests/system/tkey/ns1/named.conf.in +++ b/bin/tests/system/tkey/ns1/named.conf.in @@ -30,7 +30,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/tsiggss/ns1/named.conf.in b/bin/tests/system/tsiggss/ns1/named.conf.in index 1dfa49a900d..1419b59fc80 100644 --- a/bin/tests/system/tsiggss/ns1/named.conf.in +++ b/bin/tests/system/tsiggss/ns1/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/ttl/ns1/named.conf.in b/bin/tests/system/ttl/ns1/named.conf.in index 4c771c97bf6..0a2653fbc2c 100644 --- a/bin/tests/system/ttl/ns1/named.conf.in +++ b/bin/tests/system/ttl/ns1/named.conf.in @@ -13,7 +13,7 @@ key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/ttl/ns2/named.conf.in b/bin/tests/system/ttl/ns2/named.conf.in index d1c56acb445..17168076213 100644 --- a/bin/tests/system/ttl/ns2/named.conf.in +++ b/bin/tests/system/ttl/ns2/named.conf.in @@ -32,7 +32,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/upforwd/ns3/named.conf.in b/bin/tests/system/upforwd/ns3/named.conf.in index 0a5c7da002b..75eed2ed932 100644 --- a/bin/tests/system/upforwd/ns3/named.conf.in +++ b/bin/tests/system/upforwd/ns3/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in index e44c4efc267..54c7fe56931 100644 --- a/bin/tests/system/views/ns2/named1.conf.in +++ b/bin/tests/system/views/ns2/named1.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in index 4ec45055161..937e5b06361 100644 --- a/bin/tests/system/views/ns2/named2.conf.in +++ b/bin/tests/system/views/ns2/named2.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/views/ns2/named3.conf.in b/bin/tests/system/views/ns2/named3.conf.in index 838cfb8d1f1..758e2aab9bd 100644 --- a/bin/tests/system/views/ns2/named3.conf.in +++ b/bin/tests/system/views/ns2/named3.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in index bec49f53380..a03551ef51f 100644 --- a/bin/tests/system/views/ns3/named1.conf.in +++ b/bin/tests/system/views/ns3/named1.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in index 3becdd6bb10..6aac6892f9d 100644 --- a/bin/tests/system/views/ns3/named2.conf.in +++ b/bin/tests/system/views/ns3/named2.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.in index 4b9e236d306..d1f294cd4f2 100644 --- a/bin/tests/system/views/ns5/named.conf.in +++ b/bin/tests/system/views/ns5/named.conf.in @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.in index fbde9c1c82c..642b4bc15f2 100644 --- a/bin/tests/system/xfer/ns2/named.conf.in +++ b/bin/tests/system/xfer/ns2/named.conf.in @@ -27,7 +27,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.in index bf5b611e52c..c0bb9873a0c 100644 --- a/bin/tests/system/xfer/ns3/named.conf.in +++ b/bin/tests/system/xfer/ns3/named.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/xfer/ns4/named.conf.base b/bin/tests/system/xfer/ns4/named.conf.base index 8e77d0cd7d1..35311e1221f 100644 --- a/bin/tests/system/xfer/ns4/named.conf.base +++ b/bin/tests/system/xfer/ns4/named.conf.base @@ -26,7 +26,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; key unused_key. { diff --git a/bin/tests/system/xferquota/ns1/named.conf.in b/bin/tests/system/xferquota/ns1/named.conf.in index c9f19f92d0f..0d1933f52c3 100644 --- a/bin/tests/system/xferquota/ns1/named.conf.in +++ b/bin/tests/system/xferquota/ns1/named.conf.in @@ -25,7 +25,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in index 78f087d4586..03bc91838c8 100644 --- a/bin/tests/system/zonechecks/ns1/named.conf.in +++ b/bin/tests/system/zonechecks/ns1/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls { diff --git a/bin/tests/system/zonechecks/ns2/named.conf.in b/bin/tests/system/zonechecks/ns2/named.conf.in index 79e7c181da6..5ecf68b56f7 100644 --- a/bin/tests/system/zonechecks/ns2/named.conf.in +++ b/bin/tests/system/zonechecks/ns2/named.conf.in @@ -28,7 +28,7 @@ options { key rndc_key { secret "1234abcd8765"; - algorithm hmac-sha256; + algorithm @DEFAULT_HMAC@; }; controls {