Fix tsig system test
During rebase, custom md5 part gone missing.
This commit is contained in:
parent
b626a2bfa5
commit
78968700e2
@ -1,4 +1,4 @@
|
|||||||
From 3f9d05b72f725defd1452fd3d4b8ef3192e96c0b Mon Sep 17 00:00:00 2001
|
From 303aae42064a4f6245f9c519953a5e6dd67510c0 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
||||||
Date: Thu, 2 Aug 2018 23:46:45 +0200
|
Date: Thu, 2 Aug 2018 23:46:45 +0200
|
||||||
Subject: [PATCH] FIPS tests changes
|
Subject: [PATCH] FIPS tests changes
|
||||||
@ -86,11 +86,13 @@ Date: Wed Mar 7 10:44:23 2018 +0100
|
|||||||
bin/tests/system/rndc/setup.sh | 2 +-
|
bin/tests/system/rndc/setup.sh | 2 +-
|
||||||
bin/tests/system/rndc/tests.sh | 23 ++++---
|
bin/tests/system/rndc/tests.sh | 23 ++++---
|
||||||
bin/tests/system/tsig/ns1/named.conf.in | 10 +--
|
bin/tests/system/tsig/ns1/named.conf.in | 10 +--
|
||||||
|
bin/tests/system/tsig/ns1/rndc5.conf.in | 10 +++
|
||||||
bin/tests/system/tsig/setup.sh | 5 ++
|
bin/tests/system/tsig/setup.sh | 5 ++
|
||||||
bin/tests/system/tsig/tests.sh | 67 ++++++++++++-------
|
bin/tests/system/tsig/tests.sh | 67 ++++++++++++-------
|
||||||
bin/tests/system/upforwd/ns1/named.conf.in | 2 +-
|
bin/tests/system/upforwd/ns1/named.conf.in | 2 +-
|
||||||
bin/tests/system/upforwd/tests.sh | 2 +-
|
bin/tests/system/upforwd/tests.sh | 2 +-
|
||||||
32 files changed, 151 insertions(+), 107 deletions(-)
|
33 files changed, 161 insertions(+), 107 deletions(-)
|
||||||
|
create mode 100644 bin/tests/system/tsig/ns1/rndc5.conf.in
|
||||||
|
|
||||||
diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
|
diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
|
||||||
index 0ea6502..026db3f 100644
|
index 0ea6502..026db3f 100644
|
||||||
@ -788,6 +790,22 @@ index fbf30c6..f61657d 100644
|
|||||||
|
|
||||||
key "sha1-trunc" {
|
key "sha1-trunc" {
|
||||||
secret "FrSt77yPTFx6hTs4i2tKLB9LmE0=";
|
secret "FrSt77yPTFx6hTs4i2tKLB9LmE0=";
|
||||||
|
diff --git a/bin/tests/system/tsig/ns1/rndc5.conf.in b/bin/tests/system/tsig/ns1/rndc5.conf.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..0682194
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/bin/tests/system/tsig/ns1/rndc5.conf.in
|
||||||
|
@@ -0,0 +1,10 @@
|
||||||
|
+# Conditionally included when support for MD5 is available
|
||||||
|
+key "md5" {
|
||||||
|
+ secret "97rnFx24Tfna4mHPfgnerA==";
|
||||||
|
+ algorithm hmac-md5;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+key "md5-trunc" {
|
||||||
|
+ secret "97rnFx24Tfna4mHPfgnerA==";
|
||||||
|
+ algorithm hmac-md5-80;
|
||||||
|
+};
|
||||||
diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
|
diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
|
||||||
index b3e0450..90a6ce4 100644
|
index b3e0450..90a6ce4 100644
|
||||||
--- a/bin/tests/system/tsig/setup.sh
|
--- a/bin/tests/system/tsig/setup.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user