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 745048af406e1c275d5aeb8cb62326f6b4b7f4af..8787c6afa2f9db70ffa7e82d6315c1438bb06b1b 100644 (file)
--- 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 21aa991566a274ebacc66b1bcf1a1e0ea1fe5e7c..a95b4c18dde8fd65640f14751aef93c625b59f1d 100644 (file)
--- 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 3208c920960b7a99d8e5b27d4bcafcb9f8d32205..14cc3fec3f7b83e022ef88c92e971a70c7564d42 100644 (file)
--- 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 14e82ed2661ae3ba5e01467f223282f927e20d33..77cf110a5464ac9a6b9eeafc75effa6d23aafe62 100644 (file)
--- 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 f43f33cba84f0d89994c6ef63d52f04049714406..5ccabf9255b24fd6a26cf1936d7e68dce41859d1 100644 (file)
--- 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 fceed385ae3c167392cbb36dbccd19c5617d225e..396b1a9eb1e7a93d048e7128acb8d57833149b86 100644 (file)
--- 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 6389c33b3c9fdff711b70f7c8df809fceec95e75..951c61e8f505bebb44400bef09576db399f7283a 100644 (file)
--- 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 afd7c316d7ab9d07fb5418d10985a9075f577c0b..b2d5e05dbba40a3967eae48ae8f7d0a74f542589 100644 (file)
--- 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 68af61f6f5078a89885b5c856e494af590511a1a..74b9885bcc3ca55c928e196d244b4d02aa3267ff 100644 (file)
--- 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 d3f220512c1b53082342032cb19e4fed89eeb49b..c4a4e8fb88b0a67254ef6f312b50121b7c12e013 100644 (file)
--- 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 32e1e0d2b7ff4fc77bc67f44f0133aeef41d104f..0e1f7b021115c32852d2c290670ec37781a47ee1 100644 (file)
--- 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 e8ab737302bc06b0b71bc897d22a050450909b1a..36ff9114f300cf30a19e9788b4c6daffe67dd94b 100644 (file)
--- 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 6295404f26931e48fe86b624a13e3b139f349012..2a5548349ff85a4c7728526f22894c02fdc7aa11 100644 (file)
--- 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 460bf75c39ab09ff87a6b6c46598997dd0c7b137..32c565d68276e52389d412cbc9a4bf81d01d7913 100644 (file)
--- 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 29dfad63120fd605702a93195c5ddca2c69791d2..21d3191c9f77844743b12077d7fbb8deead7d85b 100644 (file)
--- 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 554730e6aeaa63f987dac542f52166672fa517f9..0b5cd29813cf6c4f9f7b0a77981974bb9f1e1161 100644 (file)
--- 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 31ca3ef53224ba2886c60089ccce8b5de7af3d8b..32c9b5f56997f36dfd7d396d0003479ad2005dca 100644 (file)
--- 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 44a577617d4298084a965bb85e897a59099d4e26..8086055d75537e78e156eb86318fe0beef483d72 100644 (file)
--- 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 b5421eb1bea625e5f56378c2ae2932892b1dbfa1..84aabde45683e02b957d6e7c6471ed50e9547e0f 100644 (file)
--- 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 baab6be82e5461df2f3fd8b3a04ab0ccc6e1fb89..2a306776cb09334b9c1f347edc9ba7b427f0e7e3 100644 (file)
--- 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 53d3a167edf5e2968a0a23883bd337f1884c62a9..90c80cce4ce676847e8fc36a6375a958c7c16518 100644 (file)
--- 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 a3e3e1527bf9030a016a055d58c17018eb7ba969..9b966ccd0597d0e73ad12796f5a31189b7638425 100644 (file)
--- 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 8f0dfeab0d2917cb24b8ce87e0bf7ed20b16b539..9942b68d8eb15e755ae7aa2aa3cd602b0b14b1f3 100644 (file)
--- 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 371288560ad42c0aa7cc4a5c7798dc7a021e95a9..1db9286eba2c8b8dcea9be402b59e5d3f2971055 100644 (file)
--- 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 53b88bcfc3f182f6bcdae7eef3c791d6d0db0cd3..d02ae5e7662a6ff5bf04cbdf32001df8b17a7111 100644 (file)
--- 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 129a9b1009ddff2c34e86ffc04c25092e4bc176d..130430326f7966ac6eafd133f11cb7a836833ce3 100644 (file)
--- 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 8b2ad7957145052992847c812127d2965bbe188f..038247454958a5a3de8d33155501fb718e97aebd 100644 (file)
--- 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 0b142721376bd508bb07ce1c6d3f70a89066cbd9..c49b87ec10ae274d9303d64acee90bd422db9fbb 100644 (file)
--- 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 2aabc5a8c3aaf47ae6ac0370fa392e48c20accde..87210adbf8b5c8dfab41970b398d1928d90c8178 100644 (file)
--- 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 2bf37936a396f6921ae7d1d4a19fccc1f587c090..158d8988c5f7c3c838c75b15511502c1ecf022c9 100644 (file)
--- 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 1a9697bafc4e08551bc2284aebb5d6b1a4913062..99ff66b1a271b3f24dba7dd93b385f3961bcf278 100644 (file)
--- 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 56c6a07d28e1c472291da490668d9092aedf99da..5fa7ce5ce4df4f4c984e42eb344240e3b4657279 100644 (file)
--- 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 7eb493000057f64fc1aa2387f62020800e164c95..80cfab28b88c1dfe75838692e7e3a59a15d03e66 100644 (file)
--- 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 0cb22f579008e01941e808cdd5a1ae1812da9129..fcd687d5f8d95cc1c3cfcc977e8804f7db77b445 100755 (executable)
--- 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 a4a2f612498c7f1dd07647e138a4e49615c725d0..794312497e10a50d7aa37b1be51762d7d839041b 100644 (file)
--- 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 231e5a6c324425200d0e5c59e95faefb6b971d5d..8e79ac483d8a3a218a6f66f6b385a483fbc6356c 100644 (file)
--- 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 51a2f86f3782f52e2826b9d14a9c0e7b910207eb..87f8a7fe32615e9cfcb8a572c62df2290672a7cb 100644 (file)
--- 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 ebfde148724f13ed1d75aa06c869800019fa8567..94928c1f1d40c2cc763f0f9fddd5d7e3099ce7dd 100644 (file)
--- 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 08875f953b83dc8e82067b849264421845337ae9..cdc6e020073a5a12b4beccfa448febde15c677d0 100644 (file)
--- 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 212ef85666abc613bd44e2eb7da98e1b96ad843b..09a32921f1aaafc2be80c21946a1c9b947a183a3 100644 (file)
--- 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 3369b6bdf451b9824fbe94936cb4088aada5c327..5742871a4f9bb0629f5a7e699b129f292ac8e00d 100644 (file)
--- 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 d6eaa014192b59310a5727476018d2c0c9c43da6..3a64e9d27ad924890a6210eaa6cbb3476dd5ed1e 100644 (file)
--- 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 db42f234f242d084585aba334106d7c9513f7e58..5d3bf3f0c71b2c42be5c584abf1c3e66c9afda8d 100644 (file)
--- 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 2be2f0262c07f59374ee648d63b4ca8692d3729a..f1b817a75f87e6d5f96cb2368a05f44e6ed1470f 100644 (file)
--- 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 deec9c218a6cd36952006e3f7f13a844a02612d8..ccb3de919c97501ffe29a66d6e712d1321256e6b 100644 (file)
--- 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 f334e1689916cb2e8359af58a62b5dcb9d0107e6..636f4c23fae2ee03517c7260357b68f227cc2133 100644 (file)
--- 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 ef3c91314f8cdee0c572d82f37044fabd3579250..d0278caeb9d288684c8921c63b02c0820b14f0aa 100644 (file)
--- 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 d206d565820729d95ed5b7cb00253e23e479d84f..06530a08c1b0fdfdd17289adc0d64eb922c16155 100644 (file)
--- 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 c2c008775355519e10335b09e02f20d39307aee6..7f3fb296d76df04badb4c2a3834b7f7d92324d6b 100644 (file)
--- 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 1c1713a46db69874f73bf6aecea0276aabc34650..badc2257bbba25faa7910116a02b83957ccce9f2 100644 (file)
--- 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 24320ed83ffd88f6c1a122ca8b35cb2462d2db8e..a5ee2ede8b41d50193ce96b7a4b77461907e500d 100644 (file)
--- 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 e821f5ecd47f6df3e4a5d949399d31240b5280ec..e2a9207d1fbb7bd81008f87d5b320aad39194694 100644 (file)
--- 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 4ab3f65328cb8a5b24067bcf57b037f6fb364bb0..6bb76ea404e5532a4c54d30d353a26312d9847c1 100644 (file)
--- 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 2cf128664346755b7aef762a45d95673dd1e0f6b..582b4fa636c127d190b7f612e7a916c8688eb5e5 100644 (file)
--- 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 f62cfc94973164e46183763a38507cce21aa61df..8d8f0ff1c75435267d24fd11666540b9b2b159fb 100644 (file)
--- 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 8f2687d53855adbed6f6fcadc47176945f6725f3..985974db81b6a30dbb87f57c17368242deca9da7 100644 (file)
--- 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 108877e3ad1f95b601ebf7f88d7506cbf60aac6d..1d57632f3ad64a6422f12249e1130b4ad98f1829 100644 (file)
--- 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 3adfe473eb075a3c6611495e601e87986a743caa..e493d8a4d774cbc5c27a656ad0ab44fda6aa93e4 100644 (file)
--- 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 74374b106f364690ee972fcc9cd25d5689a8b541..2d0dcef24bcdc183ff0eec1be0d74f33666d4b11 100644 (file)
--- 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 3df353b07d1871ba71c9c91c87df701a8eee9443..f056fbbf7bfee3e0f219d50fb38851900c292e1a 100644 (file)
--- 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 619a28dee64d8263825faea3b8ac9c68681c7257..f5f09055126fcb2fb04d48116fdde0729956765d 100644 (file)
--- 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 e131e04429420b7e970aa505762df6d00816dd59..3152f96f0ef76b4172ca37ad54622a5fd289969e 100644 (file)
--- 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 99e005e2fd985acdfda50df6e3ddf5e92bc838ca..2a1486d56aebabeba3d1de8a6cfa55396f2c5fec 100644 (file)
--- 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 171439d45608567c525b2707ea4b097b3e668d00..4e5a1ef095c914b0f5b3987071b39c980b6181f1 100644 (file)
--- 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 d2172a99581e8a8d84795dee9e6e4bfd9f080b00..602859b7525c1cad5d0236fd6d6453fad8808552 100644 (file)
--- 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 87d8d2429baa102ef03c5269173401db97ace54b..db449afb9ed4559125e9d98953f5b4b8a9ed1d25 100644 (file)
--- 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 0e237ad13c808daca60e76c221b44012e1862b98..0aa30071e8b8c796627d650d681fbfe5739e126f 100644 (file)
--- 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 d81ce0a710d59e1b2d73c9b524ed24bc3c997c6d..e534e54a8092fc2fd0d2a6bfceffdf013033e67d 100644 (file)
--- 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 2b837cf93031828391695152cda3a89518d58d0e..36380cd3215b9cb3d7ccd132a0dc9bf387f22b77 100644 (file)
--- 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 88f1eee9b4f8cc538b69a23f1add3b016ab4cf2e..ffc0718bfc09a2b0dfc8062dd61aa98b8557318c 100644 (file)
--- 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 b498e87be9f4fe792f51dfb5a6de77581c0e263b..986a60e02d2e7a1b98b00fb3b7102f98e6383b69 100644 (file)
--- 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 be9a43842f3c3b98e700244904a745d344cd1295..54fed8f761d93ba3ba54d7e61c99fed7b8c3093a 100644 (file)
--- 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 2c40b42a0cc8c54117dda33e609140748772abd0..34f7eeae071ceeac959897898aaa363cb9cdae95 100644 (file)
--- 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 576f57c10b6b00af18c54dc57fc7c4dc7a7a7403..c07281fdd166a19adccfe173c867caaf84563602 100644 (file)
--- 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 5cd7d84109d6d210e13bc0961f4447c4289400f2..c06b36133cbf5cd9ffa3214c4b4b4862db602d9b 100644 (file)
--- 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 aebdbed4ffa061ae75449214d2b828e0b7b50f9a..62a93cdbd6341df9adef94f5d6e3a0f8de1090ee 100644 (file)
--- 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 8c5784a67314e111dcd6ba85c632ac7bdfb8a266..2b01a5cd3c5d53484eac0ba225c6fa030b4ac761 100644 (file)
--- 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 da3f9cd221c493371afe775867a7aa337dd3fbe5..5cac0f728c1677dce6b7f32684a7763c079e90bc 100644 (file)
--- 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 578a484a3d88e14cffc89aae9e51d02e1af7095b..b6d2a446245625d19eafc23fed2117a85f1d502d 100644 (file)
--- 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 9c90c79a731dc727ff6a71b23af4655f4162b727..25281649cb8576b53c62e5a0678c8c0b4e6bf774 100644 (file)
--- 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 5ca5fcf327367d7f58b7ed1d966c487a7d07437d..c28f15bfdcd6be3940a08bb8ff3ec6f73132782a 100644 (file)
--- 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 295122ac20e4703b59986bd91c4d7425b8ec1288..f3b35e5b123bb597fa84f69bf50ca743bdc20af2 100644 (file)
--- 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 efdcaeb803350b87fb8ee3cd9a49d851129d90b2..7ccd20091760aee8a016e283141ba322ae7a2fbb 100644 (file)
--- 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 675dc187885024f4014d97ca1630d5d3e88c2cb8..ec0b3710f8cc54c3ae6654a03898cc167b3f1a05 100644 (file)
--- 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 456462f4e8c5fcb190d3224c53a56560e7c05643..b2bb0917c23c1a15317a4fd99f1404b05daf3b84 100644 (file)
--- 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 b248e02b6f5fb5e89bca69216d2b856d292f03cd..99b69608a7c703d6a068fd99eaa758b29d8b881d 100644 (file)
--- 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 26660b5f610ff664476ac52890d466b3370543f5..4470ad6aca368477ca12e6be5aed9b09f10edf82 100644 (file)
--- 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 392879b97873caf8469ead81cf01d2daa855f9c1..5aee39375f241fca2d4de38af9f8b95ccdc7346f 100644 (file)
--- 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 fc385daf34d168bc0be244c2cfb3af13aa106bd0..956bf41ef44f9756e7dee3037732aca338800a3d 100644 (file)
--- 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 497e255083612b09360c87e07d3326711d9c41f9..65f152b471e3afa9230b193b123837d3a4cfd45c 100644 (file)
--- 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 3ff936ed5021518ead630753b98e440ba868de02..e9b961242405b376676144ec31758324c7616fda 100644 (file)
--- 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 934cbb6e4ca427417fe2211b429d1318da8b2ab7..925a28051b44f2430ec1246c28393c4bad6b00f3 100644 (file)
--- 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 b2bf6d5a21db20e8b576dc0e44263c229b2c539d..45d4f97bf4b89007a0c4fe3db1d92c1e9216384e 100644 (file)
--- 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 c3e2843b97af1ae2e6062773d763e11f98c92972..9f72a6f08476f11ccc23cc4c4995240de88febfa 100644 (file)
--- 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 4d58c284681b82a5956ef64005257eb0b17e315e..e7f185e7221b644bb78d59d751353eda0576b0f9 100644 (file)
--- 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 926bf849c4052b828b2ff0f37550274df365d7a4..df139cd139ad7d9bee55f49818f6f2e1938bfabf 100644 (file)
--- 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 7b5ab8cf1b51c274739df973335b8c6c6f96a8ce..4815967511bc966473f62e0fa5d574e14dc06fe0 100644 (file)
--- 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 d03be8868716d234eba7679162cfe5bcfbf9bf53..bea7ef67afded1cdab364a6a6cde69acc49ec370 100644 (file)
--- 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 2131c2c2bbf72330012e9c10ea174b7c8fc37654..02b17732d69e5560bd1c5ef33086abe61750ec97 100644 (file)
--- 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 616e3328608e1a52706dd3d7668c4406e160de8c..b258241185cbc784fd4252d9b0203aa95d7f72fa 100644 (file)
--- 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 82e2abca7e09381ecd43a272bb14780683e41295..f421b5e6621efb3e3bcc123128e497ac7737cf18 100644 (file)
--- 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 26cf4b3d546ef9d813bd460efcf0c4b9b9bcb764..696dc48f987fc26d15889b90cfff61f84bba60ad 100644 (file)
--- 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 befa96f8443b322b6df7cd8d1a457e1065254194..5fbd453f8738a7e35f74916609d9cddbc04df8c3 100644 (file)
--- 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 b6b8073bec3f48fae4a511762ddcd1b43d6582fc..873617b6005223111ec5304f4b16b3b674eb9338 100644 (file)
--- 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 5a71a87bbe215f393e9a44a67d5950e4aada40c8..c0f79f1a409bef84a0533137d75871ff778857d2 100644 (file)
--- 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 8d5aecb463e85b04237769a7b4856080ebb84a01..c65560e6ab027c3164c830780290355e16b5b2de 100644 (file)
--- 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 7f0c815bb045fe83fefcf67346388c235e2656c9..3b0f9cb932d6f20188fc2a2bdbd9a4b247508dda 100644 (file)
--- 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 fc96b906045e74317d3499fca92615cf84296cf4..e9b0ed8f7cefb5f85774169ba1c49367f669bed4 100644 (file)
--- 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 4e9b8880392786c4f68544f9611f2058894e8f8f..5c4b1c400bc8e37a2b9723cb65302ebea9bd86f0 100644 (file)
--- 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 12b3e962574bff69ff65a3e617d497a3df6e24cd..d6ee1346e768ce6bbede3c48976850b79721fd12 100644 (file)
--- 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 2b4b1819d04c2b3d5db2956ac9682d30c4ece114..6ac14dfa6c60f2e8d581dfeb38769124fa319f45 100644 (file)
--- 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 9d520ea5629db888b0560f3ae8295a4a84856e41..5a1bd5e31eab8b7dd5643bbc2288c2dd5986e81c 100644 (file)
--- 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 5497b62f10b33c3030b203dfa5e5cd3f5cfe8595..8f2ec63a44370d0781ab669dd70fd2757046b60d 100644 (file)
--- 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 53a1946374f862c4a55f106fb41f51d1b29094ec..f31906b76c4c763ed8a7da4e34c2d2307a0a1dea 100644 (file)
--- 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 8a70ca061c7702a2c6a93b65e33d56f7a8557534..d8dd5f5ce1e55006dfb7d254e5c73e3129de82fc 100644 (file)
--- 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 5b30e5797aadb487231025e32dd6b64a484807d4..96033651d33b409c4709e174ee17654c350d7073 100644 (file)
--- 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 4b0f8af55f3c5df83ad08e83082fd393b2085cb5..7f761951fedbac895e8a3182efcd14640588738f 100644 (file)
--- 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 506b49b3c6493e24018a5e7194eb5f464195604c..f806eddd62e150d6c201c9b57e54761e683fb9aa 100644 (file)
--- 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 3860ae8c31dbb4c055202aaa4d3def0e8bb11f70..c30d8a376edd72e833e81d3a9ff5056c77cb77e4 100644 (file)
--- 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 0b9b42eb567dacaa6d4e4ffad2eb743f36a0d5ef..28687feda402ac0e4f7556ccb90d39e3ef2150c7 100644 (file)
--- 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 c53acaa09966a821dd2e5b36440ad731c18ecef4..eca537d93ec49900b02844a63ec5e19f2850affe 100644 (file)
--- 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 5df56c234b8c2a082469767d409acaec67314a4e..52999c532504f06c12abfa40338e0218ace5b2cb 100644 (file)
--- 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 58d8bd5a303819ef506da47e6cebefb4b0f8da58..7bc8d5d854b012f25bb766361189768129bf88ac 100644 (file)
--- 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 1912ee184eca5c104fb4048b84dfd6deea61e25e..a63b54b4d24907abc001931c84242a9c6c5155a6 100644 (file)
--- 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 99ec781b52cd1e8d986230b451cb87533bbb85b3..729251bb3279d40f4ed5524d5a04379d9c621955 100644 (file)
--- 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 e05965dc14c3e0e10bfec105591774f023ec0497..0f5d11f110a82f58965668613ace50c6fab58065 100644 (file)
--- 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 2f823b8951c72707ac4b047351782eed3d59060f..1c77556f783a68806db29fca98c64038590d2c90 100644 (file)
--- 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 e6e19f54c34435adcf56d2f7b9a709e4ba787a2e..928ce30809a61a7d834f79b29bea94ab57c8b785 100644 (file)
--- 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 6bbc6b7b94d27984bfd34224a2e1def8137828d3..fc200ce282ee909b6f1d9759727ad4315d937ab2 100644 (file)
--- 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 aec778f243bccfe30c627d1ce0d7210245c1f463..167938c04ec44687b8e9e8f562393581f359e88c 100644 (file)
--- 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 50892fa3bbec68eb1c3e7f96123dfcfc12f98b35..7e74c3820b2a6bc164d4f490b1d974c87f2a8807 100644 (file)
--- 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 2c0d69ed1bcd8d7ccf5d88abe4721838b83d44d1..b50246a7746f6c86ec75ee809dfbb0f4de03f870 100644 (file)
--- 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 13b379744092423faf33aef3eb7021b72d520b17..44aac9501373da876098a5b62f06b95852de74ca 100644 (file)
--- 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 33a17c013c5d9a3b355dce454804d7f686f90a6b..67febf6a650108ac7de128110c6958f623c92997 100644 (file)
--- 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 cfce6d9945332d66aa058209faa92d98e0a08405..3af1f5e8d9faaf82179616d9e1402c3b93cbc83f 100644 (file)
--- 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 81d0c99af8e67c95542a651a567691db9b4fd517..2b67360c76c52aec44efce976233f29f33ae28fc 100644 (file)
--- 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 68f8279200d8832f056cf344a87410527b4680f4..f28c90bded1954da3e5de7e2d12b904a13649569 100644 (file)
--- 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 f1a17356346aba2bc4e3269730a552ab3379a205..c85eef52c9a39ab15d8067539efac3ed3ba27429 100644 (file)
--- 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 c36777da64e1419d2b1443189e7cb0800215d746..39dec512c4fbbe770141c1587f658184e6b6cff5 100644 (file)
--- 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 cf4a5aa5f521eecea6ac9b34ffbf004f96fe78a2..82bc015ce43d2d170e67ef48ce480afdd0fa7219 100644 (file)
--- 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 1297bae9d26ffb1a00ab24c0cf6ddbdc0a89c244..7a484c7f2e3398dd8e6bd8fb9062297e3b82fde6 100644 (file)
--- 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 ead3cfed4defc4363020b3b3f0dbd6d6536d4ee3..042ac468e361869932e9174fc21a0e48e03291da 100644 (file)
--- 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 2e28ed3776e4319252cc93861a4ce1ba25ed15f4..6a7ff88b1a616b21dc1c28caa9632e2a38963675 100644 (file)
--- 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 d8fc51fe19b130360058482dd5bb4a4802484436..9b5bf3a82a1d57d8461f42dabda6960ed4b6af61 100644 (file)
--- 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 26cf4b3d546ef9d813bd460efcf0c4b9b9bcb764..696dc48f987fc26d15889b90cfff61f84bba60ad 100644 (file)
--- 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 834471f7583814acd8f1abaf0419ca9768fbe3fe..3f6e0d42c117faeb51bac56fd267cb2caecfc64e 100644 (file)
--- 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 cf9434f976a1762702b464e9e83d5b6691ced834..9b7e123bfe0e9580265ea6b297129427cc642757 100644 (file)
--- 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 9a1651e0bb2328eaf8a58e4be17fdb0973f3b8ef..79b7f72c7a575f1f8d07aab3891215ca33b13c06 100644 (file)
--- 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 848a0228cb4b487557e12d3dfd32dd5b4f2f3334..6cfac77c0205a801e97ab922a57d81f6ede4e944 100644 (file)
--- 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 40ed7b9157f2356dfb4bb02f0d37ec1a0bc00708..3679e97b12f7d15f705fd5ade509981f5963b07a 100644 (file)
--- 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 428da7d41a058793ab5f4e9fd54c1b010005405e..d8943d5b63903d3668ed5bf1450d167f05c3949b 100644 (file)
--- 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 cfd0fd213c57a85e1fd6db56a655e0d1988fdd90..e7d07e99e3fc2b72808cec0039ec0d180c465e44 100644 (file)
--- 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 11400c9748fa67a33009cc9dbde1423e59b547a4..d84d818a6e1e114cf9c916f21fbee6f9ed3020d9 100644 (file)
--- 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 8269d2519fa73e742c98bbcb67d1e45dcab2357c..828973cef5111b01d7b4b620e584a2c94a14083b 100644 (file)
--- 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 6646bea5d0783215959665016d10e325b3a7ee30..8ca32750e3942939ac149b1f162fd6a853939ccd 100644 (file)
--- 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 3eaaf6a2c3cdc9952aebf54aa0f49d6885027d3f..58b5d025144a6dca80c7a9f2d78899d5664a8692 100644 (file)
--- 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 12bf35fbf9a541a3995b18dab93171d0f3c305ca..b5389f4ff9f1337e8369a540b76a3088aad1b018 100644 (file)
--- 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 0910f948537bbed1852ac39b9bacbb2d2c80bd11..f356f2487f9bc9448c9102205d8ba8d1373c9570 100644 (file)
--- 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 84b5f4b187b683060980f917366be9981a2f3e37..728f00bb26cf2f82d949de248647d9b2d138b6ae 100644 (file)
--- 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 9e8cbdefe432e08b0a7fd4463b6fa16d29b29652..9b887360d85e144b792648f7eeedbd4d43310a68 100644 (file)
--- 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 698d5a492625bf85fb8335e518e729fc076fcd56..1650e99a7bf6d43693d6707e716141cd4d4d7ce5 100644 (file)
--- 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 75c9c53d02605b536dfc6d127b3d9be62252c434..2fe6fbbf7d838b6deea736f57505a0617e7bb3cb 100644 (file)
--- 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 eada94cede42521ee025994320292dc6e9a45ebf..c6344ad198421f21cf8cf9afb8d9f4012c8ec562 100644 (file)
--- 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 4fef5ba6863d372289b9996818f227afa71b76e1..4f9145923b2d9048a9bf8193b146cba1b5dd449b 100644 (file)
--- 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 8c64f63a975eb0c02de0f960112b988c8c8cbeb6..7af5345f8fa7fb180efab9cfc7db8beb60bd7053 100644 (file)
--- 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 8c64f63a975eb0c02de0f960112b988c8c8cbeb6..7af5345f8fa7fb180efab9cfc7db8beb60bd7053 100644 (file)
--- 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 1af5346644837d099401a40ed891af714beb003a..117a5f4f1a0bd4bbc660a82c8943b465eeb3f082 100644 (file)
--- 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 378ab67efdc38405610b2fd1c688b97979ed97db..3078e9003db6f5a43ff4df9b34d5060378f9e3a4 100644 (file)
--- 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 ef38b17cdffef6f5f2a9fb9e766acfb100115644..668142975628a6269a87028b9833b6c0d4b5fab5 100644 (file)
--- 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 5c35741b8a213604c128878f5aa00418be74db66..3b09f41668abd480d370bf5a19b45b5dfee64a6e 100644 (file)
--- 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 b72122353a5ae094f301bbb0db171855a58a6250..ce8ea75c927477a1c748507ff11adfa5ad21ca8a 100644 (file)
--- 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 439ecfff4f1e2484be6cd8ea73ee376142e646d5..4cf402e244faf89a050d16ccc4655b8b5d19e545 100644 (file)
--- 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 b34ce79bb428efcb54b0848b50946c0ee033ecac..d645e381c7aa1bb7e8e687ba41f99f1a1860166d 100644 (file)
--- 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 1dde354562d4ae96e549623802f8ad34b3c6dc21..9b2ab3a81f0a98ec25e6bf2647c89bcd9865b545 100644 (file)
--- 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 30f08c804c8e319f4a39b7309772610956ca7591..aafe7f20f450e22af840db5a742a84068481bcf4 100644 (file)
--- 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 e2a954601ee27ccba40e066e0c9d5f22f4fa08ee..909f1c63aaceef886012979b7a80d234756ec51d 100644 (file)
--- 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 a67a17f844f218549db6478a18c2e91d5c1c4ebb..e1f8fb605660eda1ade678e3112bb096dd2e3f34 100644 (file)
--- 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 3c4fbe958fae0df4bc957ffc151220ed8cf97bd3..d5fa2c46a80f61de87dac3426cf3dce4b7b92d0f 100644 (file)
--- 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 416db4d19ba0133a8f2ad2fdb5d0e0f86d4b595e..7effd3db41fefacf449faa42b724dbbc810abac0 100644 (file)
--- 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 f228c006193fee4748dff7b3e2186137d1e8b90e..aa8b342d99d92707d86ce2916e592bfdd32fdcbb 100644 (file)
--- 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 e57591ccdf0feb4d044af871e18f14f7b53a41ab..70297bdeba21663c149049ad5add21a1ea9320e6 100644 (file)
--- 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 fe81682357240948b355baba34af2f7ac3107a12..202ffa700660f2f3ba82f2344350e25c42f905c0 100644 (file)
--- 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 8f0193db70bd4cab7c88a4ccff022a16241db169..17295efc01f5eff7129beddb6a69bc08453024d4 100644 (file)
--- 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 14d749acd8a67e890ea936458e0ccb050cd54db0..4fbb35ac57552150db6ea2a540aedaa6eaa63e6f 100644 (file)
--- 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 8e08ae615c17e0a07eb3435262cedd51b3437f06..2fb16788aab959f82d875dde2f2c9bba7592a054 100644 (file)
--- 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 3b3787deb7d948c476da66486010e6e780530731..b8d87b932815f029fc01bd8ee13e1232bc568bc3 100644 (file)
--- 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 987d42f481e323ad2d3fffe24e68c11c342cbedd..abe4f9cea39560010a1f7920d62e87a578d3120c 100644 (file)
--- 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 cc17b916e49302bf5c759f408881b7ab58b5bf46..3cd598e63b1bfc59642d536c0fbac62085b4faff 100644 (file)
--- 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 b389863d4d161bf138e0938ecdfd74e3abc72c26..d8b31489cd96226b1db85688ac9bf86a5c74851e 100644 (file)
--- 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 c0dd5b891121dbdc94673f03dfcefdea102282ce..a895195be746ffcafc354333fecdb2acf0436f94 100644 (file)
--- 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 c1579031fb18470cce2ac95286a9c7c428968e02..2696a2b6b366a2c32fdbf0d80294aaecc0a8c515 100644 (file)
--- 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 985cddb6f929b98a02f0c0ed7c8603b1d5bcbf02..846c60c4d2ce8d818e557dfb091134e4cdfcb32a 100644 (file)
--- 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 263baa095c8fbe0b113057c100542c6c8cfbc384..139f68ec6787929e6de70816f1ebb745c3f6b88c 100644 (file)
--- 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 4bc5de915d7e875800f9b1d67ce74a15de675e0e..9b6ebc78917e561156b1460a67abb8ec3b85c2bb 100644 (file)
--- 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 777133d6088f6d4ee8ef7f253c5d8f0b25c15540..8b855833d46650cd6f9f5a1e063c1075cc1e7e1c 100644 (file)
--- 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 98fff793b05c494a2b7a7fde6972fba654047af7..cef5e5276791fa73c454e4bd501e44d37d8e4614 100644 (file)
--- 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 21801b4b680eff060355ba5d56a219c67c5a7de9..120aa48c7ead4e7ba70ad3973bd0a3b3bd33bfad 100644 (file)
--- 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 f7c51286aa5140b1d9845923642e71bb92b7c45d..b695901413de4425d8e5765986865875ff64ba14 100644 (file)
--- 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 6fa3fbf851d324f5264e75c60d8c9187dfbb611e..add8d1a5949fa81d8f5bbdc48e373f2032090aa5 100644 (file)
--- 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 3dba2eeb8fa7c9c16b48d9b595fac650eb4f54f3..12d9ee38bc342d65e6910135fe68ccb32b08ca6f 100644 (file)
--- 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 a292b5af406692c617f82d996f008442f7858a01..cfa60bdad3bb11e89a5476596967760e1474a107 100644 (file)
--- 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 dbec7fde8385410b1ab46f986844e0175821dc1f..85640d8331a9eb845febce98993aaa90d8be919a 100644 (file)
--- 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 fb2694e3769639b383799832076784d3240eddb7..74d2156da31be53692732c8167e781b7b9c3dfae 100644 (file)
--- 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 2ec6675c0117b1ffb67c267a9bd67932db7837b0..afb5a86212a8eb068d23d30f0ee4fc6aec454177 100644 (file)
--- 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 df3938be1eff0495e3318ef105514d3b116b7514..272d65b515bc6437362a7595df10c081480e2bf2 100644 (file)
--- 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 05e6d84994096f5b94cf974d56e35fab911a229e..f0f5210b3015b3cc70f2930779115663f8f6b877 100644 (file)
--- 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 c041a5b3f393fb86608795cbb9a0109c8e1f5b2a..2ed91dc86b111f0ceaae9386a15d6be48c633558 100644 (file)
--- 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 f8444e33c0443cd72e913decc06d1543f41411da..5007579d330f75aed0d249bf3c22f5d21e248a19 100644 (file)
--- 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 0724607b32dd48d39881195e5106f13d138b75b7..55483ab0ecfa2eb93c08e7ecf1a0581a1f936f43 100644 (file)
--- 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 cbff743d1690c239626706f128577dcdf4e2816c..e6e49c37089f9fdd4b70965d177cf0eee9e70a92 100644 (file)
--- 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 4e020378fb19df82168c66a0cd363613bb1e5b34..48fb8b481fff850262de2ef2e8b3f44ed14cff1c 100644 (file)
--- 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 f2deebf11baea070996738c771f622690bf2670b..1187e10b825996840023e584ec199d5aa9f6ced6 100644 (file)
--- 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 97021f002d05f5e4b0f7223be4702fbcc6c34b2f..4cc712d46b9573c0533336d1198222d7fa092438 100644 (file)
--- 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 04ead3325c83e315413fe305cda523925ef9022f..5781886e397eba198a786bd3fc8a689512b112f0 100644 (file)
--- 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 fd25fff4a7eb282f59c2795e8fd5c8103576f456..d1445edd322251710babce9381f775c019addbae 100644 (file)
--- 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 d45f9f587308974522b756464f880e0d36a625bc..65be7a63db9d02e30b433a40592e3b67c2ab3fbf 100644 (file)
--- 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 5f08c3ffaaf178293e377cea4d88ea95fe12e286..bfd5a8e467f50b2ad13be133e69c41f3838bd93a 100644 (file)
--- 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 8894493ba660602428ae9ee6447fa6d1b7639d55..d4f331c4ce218c676854243196e2ee0f44dff25b 100644 (file)
--- 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 7d25a1371ac7d2ebfd2498708e7f646484729c39..9a86e24acc039200b0209e3ab1024e40fd7e6c48 100644 (file)
--- 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 cc303072a2878147c2e071e66158865fbc81508c..f4b5059c44cf53b38336c08e837d91589658ad13 100644 (file)
--- 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 20fcf2ff5996e04086fd5aaeae956b2fe3de5ff1..874143a5438e14663888cd233ba6be867a516a3a 100644 (file)
--- 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 2dbc9d0a4032d623badb8edf45b2b74b4e1dbe6e..780562ffcd84d023ea06ffe7605de7dde439f303 100644 (file)
--- 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 885708c767cc1616cfe201f9fc7fb375e44964fc..42495488c20e4f36abf2ece74f2557f117c8918f 100644 (file)
--- 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 0ef4650484f15a1d9f570dfa6eb4f8fcd849fe35..c10e0f70e25fcee4b7c21b2776cacce5b03cf1b4 100644 (file)
--- 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 24c87468a9df5fc7939da1f661ab154536573c6d..c042f6a301ae15ee5f91b59fb95dde1fffbc9f93 100644 (file)
--- 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 573780033106e0a71d6cae13c745947b71d1cc09..75f039af668449f5e88d82743ef64451b3e90909 100644 (file)
--- 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 5b3b982de120fa363ec9ac3009a35d6399e3ba0b..7e2ba8b23d86f3803186acee494016e7a6a38035 100644 (file)
--- 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 a7a0546ff8ca801d8b48c936d27a343a09ad620e..3d4c770d073b16fd133250287034ea23a91058d3 100644 (file)
--- 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 7827d9db21beba2de38752d930928edda908b653..bd754f714b0c2bdbbf64274f62155e7a19f6e35f 100644 (file)
--- 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 fcaeecfe120be13fe457af824fe1f6b1bc575a85..1103fce7209eae61e431007b2a4db662ad89c625 100644 (file)
--- 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 a2e371c3ff0808518b7112ece314ae8ec11b2b15..0fd784a66695200ef18c7df7a6f1d7e1bda890b7 100644 (file)
--- 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 1dfa49a900d0c2c334083b17e329976b5c420cb1..1419b59fc80c00e10fa723d1aeb17a3c11e5d290 100644 (file)
--- 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 4c771c97bf62da557afef260e885914ee2892d8c..0a2653fbc2c48249d29f19d0cd7377a85d39fa9f 100644 (file)
--- 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 d1c56acb4453b751669999adac86e463d12406e1..171680762139fc20e55ea28ea8e0d24233e43f82 100644 (file)
--- 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 0a5c7da002be2b91ff284e81b09ac44ebf742a31..75eed2ed9328df84ea5263b1c6fbb0bfcb21fe61 100644 (file)
--- 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 e44c4efc2678eb9b9926e45d973fb4c615f3b7ff..54c7fe56931ccc029096e0a0157146af84f2e694 100644 (file)
--- 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 4ec45055161291712bea9d91a9cfb1a0362361c7..937e5b06361c7f300e678673f8fca46193d5f9c9 100644 (file)
--- 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 838cfb8d1f17feed2b242bcb4b742906e0d6ce09..758e2aab9bd3c231c170c30aaec1dd2e6aaa0349 100644 (file)
--- 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 bec49f5338012211c5a78bcc92e42bb60cae0452..a03551ef51f83260ea36a6ff93f486de8d1bcb55 100644 (file)
--- 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 3becdd6bb10ff1777dab98a041d16fafa18f1f9d..6aac6892f9de7dc4c3eb5e31cb93f848e5162e83 100644 (file)
--- 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 4b9e236d306ee2b6ce341077cfcb39689533e864..d1f294cd4f2d29fd94622f31d89a8f228b726868 100644 (file)
--- 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 fbde9c1c82cb4d9e826c05c4546bb1b7926c55d4..642b4bc15f2154ef61d3be9fffb74f71bb487643 100644 (file)
--- 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 bf5b611e52c8930547ba0fb3deb29a14712a4e74..c0bb9873a0ccb742683e701f707e9e91a8a7daa4 100644 (file)
--- 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 8e77d0cd7d1bce580457e3a38c9e249f956ff7a9..35311e1221fb39757ea01f82ebf1ed0da9db0fec 100644 (file)
--- 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 c9f19f92d0fbb0b25a13a34ca9b5d3a5b55d281f..0d1933f52c33022f68ba08c5d3202127d57289e5 100644 (file)
--- 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 78f087d4586ed01bbefa8eb0831a31614badc610..03bc91838c865d2ca604b495189b5a7e0dc98f0e 100644 (file)
--- 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 79e7c181da68fb05c9da7c6ed7d3cb9291fc7de1..5ecf68b56f7a72a3f9c78266b5adf982bd8a28bf 100644 (file)
--- 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 {