76074cd
From 3f04cf343dbeb8819197702ce1be737e26e0638a Mon Sep 17 00:00:00 2001
899014a
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
899014a
Date: Thu, 2 Aug 2018 23:46:45 +0200
ad7b3b8
Subject: [PATCH] FIPS tests changes
899014a
MIME-Version: 1.0
899014a
Content-Type: text/plain; charset=UTF-8
899014a
Content-Transfer-Encoding: 8bit
899014a
ad7b3b8
Squashed commit of the following:
ad7b3b8
899014a
commit 09e5eb48698d4fef2fc1031870de86c553b6bfaa
899014a
Author: Petr Menšík <pemensik@redhat.com>
899014a
Date:   Wed Mar 7 20:35:13 2018 +0100
899014a
899014a
    Fix nsupdate test. Do not use md5 by default for rndc, skip gracefully md5 if not available.
899014a
899014a
commit ab303db70082db76ecf36493d0b82ef3e8750cad
899014a
Author: Petr Menšík <pemensik@redhat.com>
899014a
Date:   Wed Mar 7 18:11:10 2018 +0100
899014a
899014a
    Changed root key to be RSASHA256
899014a
899014a
    Change bad trusted key to be the same algorithm.
899014a
899014a
commit 88ab07c0e14cc71247e1f9d11a1ea832b64c1ee8
899014a
Author: Petr Menšík <pemensik@redhat.com>
899014a
Date:   Wed Mar 7 16:56:17 2018 +0100
899014a
899014a
    Change used key to not use hmac-md5
899014a
899014a
    Fix upforwd test, do not use hmac-md5
899014a
899014a
commit aec891571626f053acfb4d0a247240cbc21a84e9
899014a
Author: Petr Menšík <pemensik@redhat.com>
899014a
Date:   Wed Mar 7 15:54:11 2018 +0100
899014a
899014a
    Increase bitsize of DSA key to pass FIPS 140-2 mode.
899014a
899014a
commit bca8e164fa0d9aff2f946b8b4eb0f1f7e0bf6696
899014a
Author: Petr Menšík <pemensik@redhat.com>
899014a
Date:   Wed Mar 7 15:41:08 2018 +0100
899014a
899014a
    Fix tsig and rndc tests for disabled md5
899014a
899014a
    Use hmac-sha256 instead of hmac-md5.
899014a
899014a
commit 0d314c1ab6151aa13574a21ad22f28d3b7f42a67
899014a
Author: Petr Menšík <pemensik@redhat.com>
899014a
Date:   Wed Mar 7 13:21:00 2018 +0100
899014a
899014a
    Add md5 availability detection to featuretest
899014a
899014a
commit f389a918803e2853e4b55fed62765dc4a492e34f
899014a
Author: Petr Menšík <pemensik@redhat.com>
899014a
Date:   Wed Mar 7 10:44:23 2018 +0100
899014a
899014a
    Change tests to not use hmac-md5 algorithms if not required
899014a
899014a
    Use hmac-sha256 instead of default hmac-md5 for allow-query
899014a
---
1e41691
 bin/tests/system/acl/ns2/named1.conf.in       |  4 +-
1e41691
 bin/tests/system/acl/ns2/named2.conf.in       |  4 +-
1e41691
 bin/tests/system/acl/ns2/named3.conf.in       |  6 +-
1e41691
 bin/tests/system/acl/ns2/named4.conf.in       |  4 +-
1e41691
 bin/tests/system/acl/ns2/named5.conf.in       |  4 +-
1e41691
 bin/tests/system/acl/tests.sh                 | 32 ++++-----
1e41691
 .../system/allow-query/ns2/named10.conf.in    |  2 +-
1e41691
 .../system/allow-query/ns2/named11.conf.in    |  4 +-
1e41691
 .../system/allow-query/ns2/named12.conf.in    |  2 +-
1e41691
 .../system/allow-query/ns2/named30.conf.in    |  2 +-
1e41691
 .../system/allow-query/ns2/named31.conf.in    |  4 +-
1e41691
 .../system/allow-query/ns2/named32.conf.in    |  2 +-
1e41691
 .../system/allow-query/ns2/named40.conf.in    |  4 +-
1e41691
 bin/tests/system/allow-query/tests.sh         | 18 ++---
1e41691
 bin/tests/system/catz/ns1/named.conf.in       |  2 +-
1e41691
 bin/tests/system/catz/ns2/named.conf.in       |  2 +-
1e41691
 bin/tests/system/checkconf/bad-tsig.conf      |  2 +-
1e41691
 bin/tests/system/checkconf/good.conf          |  2 +-
aaee84a
 bin/tests/system/feature-test.c               | 14 ++++
1e41691
 bin/tests/system/notify/ns5/named.conf.in     |  6 +-
1e41691
 bin/tests/system/notify/tests.sh              |  6 +-
1e41691
 bin/tests/system/nsupdate/ns1/named.conf.in   |  2 +-
1e41691
 bin/tests/system/nsupdate/ns2/named.conf.in   |  2 +-
0b18b1b
 bin/tests/system/nsupdate/setup.sh            |  6 +-
76074cd
 bin/tests/system/nsupdate/tests.sh            | 15 +++--
1e41691
 bin/tests/system/rndc/setup.sh                |  2 +-
1e41691
 bin/tests/system/rndc/tests.sh                | 23 ++++---
1e41691
 bin/tests/system/tsig/ns1/named.conf.in       | 10 +--
7896870
 bin/tests/system/tsig/ns1/rndc5.conf.in       | 10 +++
1e41691
 bin/tests/system/tsig/setup.sh                |  5 ++
b471154
 bin/tests/system/tsig/tests.sh                | 65 ++++++++++++-------
1e41691
 bin/tests/system/upforwd/ns1/named.conf.in    |  2 +-
1e41691
 bin/tests/system/upforwd/tests.sh             |  2 +-
76074cd
 33 files changed, 162 insertions(+), 108 deletions(-)
7896870
 create mode 100644 bin/tests/system/tsig/ns1/rndc5.conf.in
899014a
899014a
diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
76074cd
index 60f22e1..249f672 100644
899014a
--- a/bin/tests/system/acl/ns2/named1.conf.in
899014a
+++ b/bin/tests/system/acl/ns2/named1.conf.in
899014a
@@ -33,12 +33,12 @@ options {
899014a
 };
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in
76074cd
index ada97bc..f82d858 100644
899014a
--- a/bin/tests/system/acl/ns2/named2.conf.in
899014a
+++ b/bin/tests/system/acl/ns2/named2.conf.in
899014a
@@ -33,12 +33,12 @@ options {
899014a
 };
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in
76074cd
index 97684e4..de6a2e9 100644
899014a
--- a/bin/tests/system/acl/ns2/named3.conf.in
899014a
+++ b/bin/tests/system/acl/ns2/named3.conf.in
899014a
@@ -33,17 +33,17 @@ options {
899014a
 };
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key three {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in
76074cd
index 462b3fa..994b35c 100644
899014a
--- a/bin/tests/system/acl/ns2/named4.conf.in
899014a
+++ b/bin/tests/system/acl/ns2/named4.conf.in
899014a
@@ -33,12 +33,12 @@ options {
899014a
 };
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
76074cd
index 728da58..8f00d09 100644
899014a
--- a/bin/tests/system/acl/ns2/named5.conf.in
899014a
+++ b/bin/tests/system/acl/ns2/named5.conf.in
b471154
@@ -35,12 +35,12 @@ options {
899014a
 };
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
76074cd
index be59d64..13d5bdc 100644
899014a
--- a/bin/tests/system/acl/tests.sh
899014a
+++ b/bin/tests/system/acl/tests.sh
899014a
@@ -22,14 +22,14 @@ echo_i "testing basic ACL processing"
899014a
 # key "one" should fail
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.1 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.1 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 
899014a
 # any other key should be fine
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.1 axfr -y hmac-sha256:two:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 copy_setports ns2/named2.conf.in ns2/named.conf
899014a
@@ -39,18 +39,18 @@ sleep 5
899014a
 # prefix 10/8 should fail
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.1 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.1 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # any other address should work, as long as it sends key "one"
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 127.0.0.1 axfr -y two:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 127.0.0.1 axfr -y hmac-sha256:two:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 127.0.0.1 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 127.0.0.1 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 echo_i "testing nested ACL processing"
899014a
@@ -62,31 +62,31 @@ sleep 5
899014a
 # should succeed
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.2 axfr -y two:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.2 axfr -y hmac-sha256:two:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # should succeed
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.2 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.2 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # should succeed
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.1 axfr -y hmac-sha256:two:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # should succeed
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.1 axfr -y hmac-sha256:two:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # but only one or the other should fail
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 127.0.0.1 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 127.0.0.1 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 t=`expr $t + 1`
899014a
@@ -97,7 +97,7 @@ grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $tt failed" ; status=1
899014a
 # and other values? right out
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 127.0.0.1 axfr -y three:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 127.0.0.1 axfr -y hmac-sha256:three:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # now we only allow 10.53.0.1 *and* key one, or 10.53.0.2 *and* key two
899014a
@@ -108,31 +108,31 @@ sleep 5
899014a
 # should succeed
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.2 axfr -y two:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.2 axfr -y hmac-sha256:two:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # should succeed
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.1 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.1 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 && { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # should fail
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.2 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.2 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # should fail
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.1 axfr -y hmac-sha256:two:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 # should fail
899014a
 t=`expr $t + 1`
899014a
 $DIG $DIGOPTS tsigzone. \
899014a
-	@10.53.0.2 -b 10.53.0.3 axfr -y one:1234abcd8765 > dig.out.${t}
899014a
+	@10.53.0.2 -b 10.53.0.3 axfr -y hmac-sha256:one:1234abcd8765 > dig.out.${t}
899014a
 grep "^;" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
899014a
 
899014a
 echo_i "testing allow-query-on ACL processing"
899014a
diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in
76074cd
index 7d43e36..f7b25f9 100644
899014a
--- a/bin/tests/system/allow-query/ns2/named10.conf.in
899014a
+++ b/bin/tests/system/allow-query/ns2/named10.conf.in
0b18b1b
@@ -10,7 +10,7 @@
0b18b1b
  */
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
76074cd
index 2952518..121557e 100644
899014a
--- a/bin/tests/system/allow-query/ns2/named11.conf.in
899014a
+++ b/bin/tests/system/allow-query/ns2/named11.conf.in
0b18b1b
@@ -10,12 +10,12 @@
0b18b1b
  */
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234efgh8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in
76074cd
index 0c01071..ceabbb5 100644
899014a
--- a/bin/tests/system/allow-query/ns2/named12.conf.in
899014a
+++ b/bin/tests/system/allow-query/ns2/named12.conf.in
0b18b1b
@@ -10,7 +10,7 @@
0b18b1b
  */
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in
76074cd
index 4c17292..9cd9d1f 100644
899014a
--- a/bin/tests/system/allow-query/ns2/named30.conf.in
899014a
+++ b/bin/tests/system/allow-query/ns2/named30.conf.in
0b18b1b
@@ -10,7 +10,7 @@
0b18b1b
  */
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
76074cd
index a2690a4..f488730 100644
899014a
--- a/bin/tests/system/allow-query/ns2/named31.conf.in
899014a
+++ b/bin/tests/system/allow-query/ns2/named31.conf.in
0b18b1b
@@ -10,12 +10,12 @@
0b18b1b
  */
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234efgh8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in
76074cd
index a0708c8..51fa457 100644
899014a
--- a/bin/tests/system/allow-query/ns2/named32.conf.in
899014a
+++ b/bin/tests/system/allow-query/ns2/named32.conf.in
0b18b1b
@@ -10,7 +10,7 @@
0b18b1b
  */
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
76074cd
index 687768e..d24d6d2 100644
899014a
--- a/bin/tests/system/allow-query/ns2/named40.conf.in
899014a
+++ b/bin/tests/system/allow-query/ns2/named40.conf.in
0b18b1b
@@ -14,12 +14,12 @@ acl accept { 10.53.0.2; };
899014a
 acl badaccept { 10.53.0.1; };
899014a
 
899014a
 key one {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
 key two {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "1234efgh8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh
76074cd
index fe40635..543c663 100644
899014a
--- a/bin/tests/system/allow-query/tests.sh
899014a
+++ b/bin/tests/system/allow-query/tests.sh
0b18b1b
@@ -182,7 +182,7 @@ rndc_reload ns2 10.53.0.2
899014a
 
899014a
 echo_i "test $n: key allowed - query allowed"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -195,7 +195,7 @@ rndc_reload ns2 10.53.0.2
899014a
 
899014a
 echo_i "test $n: key not allowed - query refused"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y two:1234efgh8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:two:1234efgh8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -208,7 +208,7 @@ rndc_reload ns2 10.53.0.2
899014a
 
899014a
 echo_i "test $n: key disallowed - query refused"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -341,7 +341,7 @@ rndc_reload ns2 10.53.0.2
899014a
 
899014a
 echo_i "test $n: views key allowed - query allowed"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -354,7 +354,7 @@ rndc_reload ns2 10.53.0.2
899014a
 
899014a
 echo_i "test $n: views key not allowed - query refused"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y two:1234efgh8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:two:1234efgh8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -367,7 +367,7 @@ rndc_reload ns2 10.53.0.2
899014a
 
899014a
 echo_i "test $n: views key disallowed - query refused"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -500,7 +500,7 @@ status=`expr $status + $ret`
899014a
 n=`expr $n + 1`
899014a
 echo_i "test $n: zone key allowed - query allowed"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.keyallow.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:one:1234abcd8765 a.keyallow.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.keyallow.example' dig.out.ns2.$n > /dev/null || ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -510,7 +510,7 @@ status=`expr $status + $ret`
899014a
 n=`expr $n + 1`
899014a
 echo_i "test $n: zone key not allowed - query refused"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y two:1234efgh8765 a.keyallow.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:two:1234efgh8765 a.keyallow.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.keyallow.example' dig.out.ns2.$n > /dev/null && ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
0b18b1b
@@ -520,7 +520,7 @@ status=`expr $status + $ret`
899014a
 n=`expr $n + 1`
899014a
 echo_i "test $n: zone key disallowed - query refused"
899014a
 ret=0
899014a
-$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.keydisallow.example a > dig.out.ns2.$n || ret=1
899014a
+$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y hmac-sha256:one:1234abcd8765 a.keydisallow.example a > dig.out.ns2.$n || ret=1
899014a
 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
899014a
 grep '^a.keydisallow.example' dig.out.ns2.$n > /dev/null && ret=1
899014a
 if [ $ret != 0 ]; then echo_i "failed"; fi
899014a
diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
76074cd
index 1218669..e62715e 100644
899014a
--- a/bin/tests/system/catz/ns1/named.conf.in
899014a
+++ b/bin/tests/system/catz/ns1/named.conf.in
899014a
@@ -61,5 +61,5 @@ zone "catalog4.example" {
899014a
 
899014a
 key tsig_key. {
899014a
 	secret "LSAnCU+Z";
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 };
899014a
diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in
76074cd
index 30333e6..4005152 100644
899014a
--- a/bin/tests/system/catz/ns2/named.conf.in
899014a
+++ b/bin/tests/system/catz/ns2/named.conf.in
899014a
@@ -70,5 +70,5 @@ zone "catalog4.example" {
899014a
 
899014a
 key tsig_key. {
899014a
 	secret "LSAnCU+Z";
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 };
899014a
diff --git a/bin/tests/system/checkconf/bad-tsig.conf b/bin/tests/system/checkconf/bad-tsig.conf
ad7b3b8
index 21be03e..e57c308 100644
899014a
--- a/bin/tests/system/checkconf/bad-tsig.conf
899014a
+++ b/bin/tests/system/checkconf/bad-tsig.conf
899014a
@@ -11,7 +11,7 @@
899014a
 
899014a
 /* Bad secret */
899014a
 key "badtsig" {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha256;
899014a
 	secret "jEdD+BPKg==";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf
76074cd
index e09b9e8..2e824b3 100644
899014a
--- a/bin/tests/system/checkconf/good.conf
899014a
+++ b/bin/tests/system/checkconf/good.conf
76074cd
@@ -210,6 +210,6 @@ dyndb "name" "library.so" {
899014a
 	system;
899014a
 };
899014a
 key "mykey" {
899014a
-	algorithm "hmac-md5";
899014a
+	algorithm "hmac-sha256";
899014a
 	secret "qwertyuiopasdfgh";
899014a
 };
899014a
diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
76074cd
index 877504f..577660a 100644
899014a
--- a/bin/tests/system/feature-test.c
899014a
+++ b/bin/tests/system/feature-test.c
b626a2b
@@ -14,6 +14,7 @@
b626a2b
 #include <string.h>
b626a2b
 #include <unistd.h>
b626a2b
 
b626a2b
+#include <isc/md.h>
b626a2b
 #include <isc/net.h>
899014a
 #include <isc/print.h>
899014a
 #include <isc/util.h>
76074cd
@@ -186,6 +187,19 @@ main(int argc, char **argv) {
b626a2b
 #endif /* ifdef DLZ_FILESYSTEM */
899014a
 	}
899014a
 
899014a
+	if (strcmp(argv[1], "--md5") == 0) {
0b18b1b
+		unsigned char digest[ISC_MAX_MD_SIZE];
aaee84a
+		const unsigned char test[] = "test";
aaee84a
+		unsigned int size = sizeof(digest);
0b18b1b
+
0b18b1b
+		if (isc_md(ISC_MD_MD5, test, sizeof(test),
aaee84a
+		           digest, &size) == ISC_R_SUCCESS) {
899014a
+			return (0);
899014a
+		} else {
899014a
+			return (1);
899014a
+		}
899014a
+	}
899014a
+
b471154
 	if (strcmp(argv[1], "--with-idn") == 0) {
b471154
 #ifdef HAVE_LIBIDN2
899014a
 		return (0);
899014a
diff --git a/bin/tests/system/notify/ns5/named.conf.in b/bin/tests/system/notify/ns5/named.conf.in
76074cd
index 1ee8df4..2b75d9a 100644
899014a
--- a/bin/tests/system/notify/ns5/named.conf.in
899014a
+++ b/bin/tests/system/notify/ns5/named.conf.in
899014a
@@ -10,17 +10,17 @@
899014a
  */
899014a
 
899014a
 key "a" {
899014a
-	algorithm "hmac-md5";
899014a
+	algorithm "hmac-sha256";
899014a
 	secret "aaaaaaaaaaaaaaaaaaaa";
899014a
 };
899014a
 
899014a
 key "b" {
899014a
-	algorithm "hmac-md5";
899014a
+	algorithm "hmac-sha256";
899014a
 	secret "bbbbbbbbbbbbbbbbbbbb";
899014a
 };
899014a
 
899014a
 key "c" {
899014a
-	algorithm "hmac-md5";
899014a
+	algorithm "hmac-sha256";
899014a
 	secret "cccccccccccccccccccc";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
b471154
index 3d7e0b7..ec4d9a7 100644
899014a
--- a/bin/tests/system/notify/tests.sh
899014a
+++ b/bin/tests/system/notify/tests.sh
1e41691
@@ -212,16 +212,16 @@ ret=0
899014a
 $NSUPDATE << EOF
899014a
 server 10.53.0.5 ${PORT}
899014a
 zone x21
899014a
-key a aaaaaaaaaaaaaaaaaaaa
899014a
+key hmac-sha256:a aaaaaaaaaaaaaaaaaaaa
899014a
 update add added.x21 0 in txt "test string"
899014a
 send
899014a
 EOF
899014a
 
899014a
 for i in 1 2 3 4 5 6 7 8 9
899014a
 do
899014a
-	$DIG $DIGOPTS added.x21. -y b:bbbbbbbbbbbbbbbbbbbb @10.53.0.5 \
899014a
+	$DIG $DIGOPTS added.x21. -y hmac-sha256:b:bbbbbbbbbbbbbbbbbbbb @10.53.0.5 \
899014a
 		txt > dig.out.b.ns5.test$n || ret=1
899014a
-	$DIG $DIGOPTS added.x21. -y c:cccccccccccccccccccc @10.53.0.5 \
899014a
+	$DIG $DIGOPTS added.x21. -y hmac-sha256:c:cccccccccccccccccccc @10.53.0.5 \
899014a
 		txt > dig.out.c.ns5.test$n || ret=1
899014a
 	grep "test string" dig.out.b.ns5.test$n > /dev/null &&
899014a
 	grep "test string" dig.out.c.ns5.test$n > /dev/null &&
899014a
diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
76074cd
index b51e700..436c97d 100644
899014a
--- a/bin/tests/system/nsupdate/ns1/named.conf.in
899014a
+++ b/bin/tests/system/nsupdate/ns1/named.conf.in
76074cd
@@ -37,7 +37,7 @@ controls {
899014a
 };
899014a
 
899014a
 key altkey {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha512;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
76074cd
index da6b3b4..c547e47 100644
899014a
--- a/bin/tests/system/nsupdate/ns2/named.conf.in
899014a
+++ b/bin/tests/system/nsupdate/ns2/named.conf.in
0b18b1b
@@ -32,7 +32,7 @@ controls {
899014a
 };
899014a
 
899014a
 key altkey {
899014a
-	algorithm hmac-md5;
899014a
+	algorithm hmac-sha512;
899014a
 	secret "1234abcd8765";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
b471154
index c055da3..4e1242b 100644
899014a
--- a/bin/tests/system/nsupdate/setup.sh
899014a
+++ b/bin/tests/system/nsupdate/setup.sh
0b18b1b
@@ -56,7 +56,11 @@ EOF
899014a
 
0b18b1b
 $DDNSCONFGEN -q -z example.nil > ns1/ddns.key
899014a
 
0b18b1b
-$DDNSCONFGEN -q -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key
899014a
+if $FEATURETEST --md5; then
0b18b1b
+	$DDNSCONFGEN -q -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key
899014a
+else
899014a
+	echo -n > ns1/md5.key
899014a
+fi
0b18b1b
 $DDNSCONFGEN -q -a hmac-sha1 -k sha1-key -z keytests.nil > ns1/sha1.key
0b18b1b
 $DDNSCONFGEN -q -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key
0b18b1b
 $DDNSCONFGEN -q -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key
899014a
diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
76074cd
index b35d797..41c128e 100755
899014a
--- a/bin/tests/system/nsupdate/tests.sh
899014a
+++ b/bin/tests/system/nsupdate/tests.sh
b471154
@@ -797,7 +797,14 @@ fi
899014a
 n=`expr $n + 1`
899014a
 ret=0
76074cd
 echo_i "check TSIG key algorithms (nsupdate -k) ($n)"
899014a
-for alg in md5 sha1 sha224 sha256 sha384 sha512; do
899014a
+if $FEATURETEST --md5
899014a
+then
899014a
+	ALGS="md5 sha1 sha224 sha256 sha384 sha512"
899014a
+else
899014a
+	ALGS="sha1 sha224 sha256 sha384 sha512"
899014a
+	echo_i "skipping disabled md5 algorithm"
899014a
+fi
899014a
+for alg in $ALGS; do
899014a
     $NSUPDATE -k ns1/${alg}.key <<END > /dev/null || ret=1
899014a
 server 10.53.0.1 ${PORT}
899014a
 update add ${alg}.keytests.nil. 600 A 10.10.10.3
b471154
@@ -805,7 +812,7 @@ send
899014a
 END
899014a
 done
899014a
 sleep 2
899014a
-for alg in md5 sha1 sha224 sha256 sha384 sha512; do
899014a
+for alg in $ALGS; do
899014a
     $DIG $DIGOPTS +short @10.53.0.1 ${alg}.keytests.nil | grep 10.10.10.3 > /dev/null 2>&1 || ret=1
899014a
 done
899014a
 if [ $ret -ne 0 ]; then
76074cd
@@ -816,7 +823,7 @@ fi
76074cd
 n=`expr $n + 1`
76074cd
 ret=0
76074cd
 echo_i "check TSIG key algorithms (nsupdate -y) ($n)"
76074cd
-for alg in md5 sha1 sha224 sha256 sha384 sha512; do
76074cd
+for alg in $ALGS; do
76074cd
     secret=$(sed -n 's/.*secret "\(.*\)";.*/\1/p' ns1/${alg}.key)
76074cd
     $NSUPDATE -y "hmac-${alg}:${alg}-key:$secret" <<END > /dev/null || ret=1
76074cd
 server 10.53.0.1 ${PORT}
76074cd
@@ -825,7 +832,7 @@ send
76074cd
 END
76074cd
 done
76074cd
 sleep 2
76074cd
-for alg in md5 sha1 sha224 sha256 sha384 sha512; do
76074cd
+for alg in $ALGS; do
76074cd
     $DIG $DIGOPTS +short @10.53.0.1 ${alg}.keytests.nil | grep 10.10.10.50 > /dev/null 2>&1 || ret=1
76074cd
 done
76074cd
 if [ $ret -ne 0 ]; then
899014a
diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
b471154
index b59e7a7..04d5f5a 100644
899014a
--- a/bin/tests/system/rndc/setup.sh
899014a
+++ b/bin/tests/system/rndc/setup.sh
b626a2b
@@ -33,7 +33,7 @@ make_key () {
899014a
             sed 's/allow { 10.53.0.4/allow { any/' >> ns4/named.conf
899014a
 }
899014a
 
899014a
-make_key 1 ${EXTRAPORT1} hmac-md5
899014a
+$FEATURETEST --md5 && make_key 1 ${EXTRAPORT1} hmac-md5
899014a
 make_key 2 ${EXTRAPORT2} hmac-sha1
899014a
 make_key 3 ${EXTRAPORT3} hmac-sha224
899014a
 make_key 4 ${EXTRAPORT4} hmac-sha256
899014a
diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
76074cd
index 9fd84ed..d0b188f 100644
899014a
--- a/bin/tests/system/rndc/tests.sh
899014a
+++ b/bin/tests/system/rndc/tests.sh
b626a2b
@@ -348,15 +348,20 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
899014a
 status=`expr $status + $ret`
899014a
 
899014a
 n=`expr $n + 1`
899014a
-echo_i "testing rndc with hmac-md5 ($n)"
899014a
-ret=0
899014a
-$RNDC -s 10.53.0.4 -p ${EXTRAPORT1} -c ns4/key1.conf status > /dev/null 2>&1 || ret=1
899014a
-for i in 2 3 4 5 6
899014a
-do
899014a
-        $RNDC -s 10.53.0.4 -p ${EXTRAPORT1} -c ns4/key${i}.conf status > /dev/null 2>&1 && ret=1
899014a
-done
899014a
-if [ $ret != 0 ]; then echo_i "failed"; fi
899014a
-status=`expr $status + $ret`
899014a
+if $FEATURETEST --md5
899014a
+then
899014a
+	echo_i "testing rndc with hmac-md5 ($n)"
899014a
+	ret=0
899014a
+	$RNDC -s 10.53.0.4 -p ${EXTRAPORT1} -c ns4/key1.conf status > /dev/null 2>&1 || ret=1
899014a
+	for i in 2 3 4 5 6
899014a
+	do
899014a
+		$RNDC -s 10.53.0.4 -p ${EXTRAPORT1} -c ns4/key${i}.conf status > /dev/null 2>&1 && ret=1
899014a
+	done
899014a
+	if [ $ret != 0 ]; then echo_i "failed"; fi
899014a
+	status=`expr $status + $ret`
899014a
+else
899014a
+	echo_i "skipping rndc with hmac-md5 ($n)"
899014a
+fi
899014a
 
899014a
 n=`expr $n + 1`
899014a
 echo_i "testing rndc with hmac-sha1 ($n)"
899014a
diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in
76074cd
index 3470c4f..cf539cd 100644
899014a
--- a/bin/tests/system/tsig/ns1/named.conf.in
899014a
+++ b/bin/tests/system/tsig/ns1/named.conf.in
899014a
@@ -21,10 +21,7 @@ options {
899014a
 	notify no;
899014a
 };
899014a
 
899014a
-key "md5" {
899014a
-	secret "97rnFx24Tfna4mHPfgnerA==";
899014a
-	algorithm hmac-md5;
899014a
-};
899014a
+# md5 key appended by setup.sh at the end
899014a
 
899014a
 key "sha1" {
899014a
 	secret "FrSt77yPTFx6hTs4i2tKLB9LmE0=";
899014a
@@ -51,10 +48,7 @@ key "sha512" {
899014a
 	algorithm hmac-sha512;
899014a
 };
899014a
 
899014a
-key "md5-trunc" {
899014a
-	secret "97rnFx24Tfna4mHPfgnerA==";
899014a
-	algorithm hmac-md5-80;
899014a
-};
899014a
+# md5-trunc key appended by setup.sh at the end
899014a
 
899014a
 key "sha1-trunc" {
899014a
 	secret "FrSt77yPTFx6hTs4i2tKLB9LmE0=";
7896870
diff --git a/bin/tests/system/tsig/ns1/rndc5.conf.in b/bin/tests/system/tsig/ns1/rndc5.conf.in
7896870
new file mode 100644
7896870
index 0000000..0682194
7896870
--- /dev/null
7896870
+++ b/bin/tests/system/tsig/ns1/rndc5.conf.in
7896870
@@ -0,0 +1,10 @@
7896870
+# Conditionally included when support for MD5 is available
7896870
+key "md5" {
7896870
+	secret "97rnFx24Tfna4mHPfgnerA==";
7896870
+	algorithm hmac-md5;
7896870
+};
7896870
+
7896870
+key "md5-trunc" {
7896870
+	secret "97rnFx24Tfna4mHPfgnerA==";
7896870
+	algorithm hmac-md5-80;
7896870
+};
899014a
diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
b471154
index e3b4a45..ae21d04 100644
899014a
--- a/bin/tests/system/tsig/setup.sh
899014a
+++ b/bin/tests/system/tsig/setup.sh
0b18b1b
@@ -15,3 +15,8 @@ SYSTEMTESTTOP=..
0b18b1b
 $SHELL clean.sh
899014a
 
0b18b1b
 copy_setports ns1/named.conf.in ns1/named.conf
1e41691
+
899014a
+if $FEATURETEST --md5
899014a
+then
899014a
+	cat ns1/rndc5.conf.in >> ns1/named.conf
899014a
+fi
899014a
diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
b471154
index 38d842a..668aa6f 100644
899014a
--- a/bin/tests/system/tsig/tests.sh
899014a
+++ b/bin/tests/system/tsig/tests.sh
899014a
@@ -26,20 +26,25 @@ sha512="jI/Pa4qRu96t76Pns5Z/Ndxbn3QCkwcxLOgt9vgvnJw5wqTRvNyk3FtD6yIMd1dWVlqZ+Y4f
899014a
 
899014a
 status=0
899014a
 
899014a
-echo_i "fetching using hmac-md5 (old form)"
899014a
-ret=0
899014a
-$DIG $DIGOPTS example.nil. -y "md5:$md5" @10.53.0.1 soa > dig.out.md5.old || ret=1
899014a
-grep -i "md5.*TSIG.*NOERROR" dig.out.md5.old > /dev/null || ret=1
899014a
-if [ $ret -eq 1 ] ; then
899014a
-	echo_i "failed"; status=1
899014a
-fi
899014a
+if $FEATURETEST --md5
899014a
+then
899014a
+	echo_i "fetching using hmac-md5 (old form)"
899014a
+	ret=0
899014a
+	$DIG $DIGOPTS example.nil. -y "md5:$md5" @10.53.0.1 soa > dig.out.md5.old || ret=1
899014a
+	grep -i "md5.*TSIG.*NOERROR" dig.out.md5.old > /dev/null || ret=1
899014a
+	if [ $ret -eq 1 ] ; then
899014a
+		echo_i "failed"; status=1
899014a
+	fi
b471154
 
b471154
-echo_i "fetching using hmac-md5 (new form)"
b471154
-ret=0
b471154
-$DIG $DIGOPTS example.nil. -y "hmac-md5:md5:$md5" @10.53.0.1 soa > dig.out.md5.new || ret=1
b471154
-grep -i "md5.*TSIG.*NOERROR" dig.out.md5.new > /dev/null || ret=1
b471154
-if [ $ret -eq 1 ] ; then
b471154
-	echo_i "failed"; status=1
899014a
+	echo_i "fetching using hmac-md5 (new form)"
899014a
+	ret=0
899014a
+	$DIG $DIGOPTS example.nil. -y "hmac-md5:md5:$md5" @10.53.0.1 soa > dig.out.md5.new || ret=1
899014a
+	grep -i "md5.*TSIG.*NOERROR" dig.out.md5.new > /dev/null || ret=1
899014a
+	if [ $ret -eq 1 ] ; then
899014a
+		echo_i "failed"; status=1
899014a
+	fi
899014a
+else
899014a
+	echo_i "skipping using hmac-md5"
899014a
 fi
899014a
 
899014a
 echo_i "fetching using hmac-sha1"
899014a
@@ -87,12 +92,17 @@ fi
899014a
 #	Truncated TSIG
899014a
 #
899014a
 #
899014a
-echo_i "fetching using hmac-md5 (trunc)"
899014a
-ret=0
899014a
-$DIG $DIGOPTS example.nil. -y "hmac-md5-80:md5-trunc:$md5" @10.53.0.1 soa > dig.out.md5.trunc || ret=1
899014a
-grep -i "md5-trunc.*TSIG.*NOERROR" dig.out.md5.trunc > /dev/null || ret=1
899014a
-if [ $ret -eq 1 ] ; then
899014a
-	echo_i "failed"; status=1
899014a
+if $FEATURETEST --md5
899014a
+then
899014a
+	echo_i "fetching using hmac-md5 (trunc)"
899014a
+	ret=0
899014a
+	$DIG $DIGOPTS example.nil. -y "hmac-md5-80:md5-trunc:$md5" @10.53.0.1 soa > dig.out.md5.trunc || ret=1
899014a
+	grep -i "md5-trunc.*TSIG.*NOERROR" dig.out.md5.trunc > /dev/null || ret=1
899014a
+	if [ $ret -eq 1 ] ; then
899014a
+		echo_i "failed"; status=1
899014a
+	fi
899014a
+else
899014a
+	echo_i "skipping using hmac-md5 (trunc)"
899014a
 fi
899014a
 
899014a
 echo_i "fetching using hmac-sha1 (trunc)"
899014a
@@ -141,12 +151,17 @@ fi
899014a
 #	Check for bad truncation.
899014a
 #
899014a
 #
899014a
-echo_i "fetching using hmac-md5-80 (BADTRUNC)"
899014a
-ret=0
899014a
-$DIG $DIGOPTS example.nil. -y "hmac-md5-80:md5:$md5" @10.53.0.1 soa > dig.out.md5-80 || ret=1
899014a
-grep -i "md5.*TSIG.*BADTRUNC" dig.out.md5-80 > /dev/null || ret=1
899014a
-if [ $ret -eq 1 ] ; then
899014a
-	echo_i "failed"; status=1
899014a
+if $FEATURETEST --md5
899014a
+then
899014a
+	echo_i "fetching using hmac-md5-80 (BADTRUNC)" 
899014a
+	ret=0
899014a
+	$DIG $DIGOPTS example.nil. -y "hmac-md5-80:md5:$md5" @10.53.0.1 soa > dig.out.md5-80 || ret=1
899014a
+	grep -i "md5.*TSIG.*BADTRUNC" dig.out.md5-80 > /dev/null || ret=1
899014a
+	if [ $ret -eq 1 ] ; then
899014a
+		echo_i "failed"; status=1
899014a
+	fi
899014a
+else
899014a
+	echo_i "skipping using hmac-md5-80 (BADTRUNC)" 
899014a
 fi
899014a
 
899014a
 echo_i "fetching using hmac-sha1-80 (BADTRUNC)"
899014a
diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in
76074cd
index 3873c7c..b359a5a 100644
899014a
--- a/bin/tests/system/upforwd/ns1/named.conf.in
899014a
+++ b/bin/tests/system/upforwd/ns1/named.conf.in
899014a
@@ -10,7 +10,7 @@
899014a
  */
899014a
 
899014a
 key "update.example." {
899014a
-	algorithm "hmac-md5";
899014a
+	algorithm "hmac-sha256";
899014a
 	secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K";
899014a
 };
899014a
 
899014a
diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
76074cd
index a50c896..8062d68 100644
899014a
--- a/bin/tests/system/upforwd/tests.sh
899014a
+++ b/bin/tests/system/upforwd/tests.sh
76074cd
@@ -79,7 +79,7 @@ if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
899014a
 
899014a
 echo_i "updating zone (signed) ($n)"
899014a
 ret=0
899014a
-$NSUPDATE -y update.example:c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K -- - <
899014a
+$NSUPDATE -y hmac-sha256:update.example:c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K -- - <
899014a
 server 10.53.0.3 ${PORT}
899014a
 update add updated.example. 600 A 10.10.10.1
899014a
 update add updated.example. 600 TXT Foo
899014a
-- 
b471154
2.26.2
899014a