Commit 351efd88 authored by Ondřej Surý's avatar Ondřej Surý

Update digdelv system test to not use static RSAMD5 key and make scripts shellcheck clean

parent 7ff7de06
......@@ -9,14 +9,15 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
rm -f */named.memstats
rm -f */named.run
rm -f */named.conf
rm -f delv.out.test*
rm -f dig.out.*test*
rm -f dig.out.mm.*
rm -f dig.out.mn.*
rm -f dig.out.nm.*
rm -f dig.out.nn.*
rm -f ns*/named.lock
rm -f ns*/managed-keys.bind*
rm -f ./*/named.memstats
rm -f ./*/named.run
rm -f ./*/named.conf
rm -f ./delv.out.test*
rm -f ./dig.out.*test*
rm -f ./dig.out.mm.*
rm -f ./dig.out.mn.*
rm -f ./dig.out.nm.*
rm -f ./dig.out.nn.*
rm -f ./ns*/named.lock
rm -f ./ns*/managed-keys.bind*
rm -f ./ns2/example.db ./ns2/K* ./ns2/keyid ./ns2/keydata
......@@ -35,16 +35,6 @@ foo TXT "testing"
foo A 10.0.1.0
foo SSHFP 2 1 123456789abcdef67890123456789abcdef67890
;;
;; we are not testing DNSSEC behavior, so we don't care about the semantics
;; of the following records.
dnskey 300 DNSKEY 256 3 1 (
AQPTpWyReB/e9Ii6mVGnakS8hX2zkh/iUYAg
+Ge4noWROpTWOIBvm76zeJPWs4Zfqa1IsswD
Ix5Mqeg0zwclz59uecKsKyx5w9IhtZ8plc4R
b9VIE5x7KNHAYTvTO5d4S8M=
)
; TTL of 3 weeks
weeks 1814400 A 10.53.0.2
; TTL of 3 days
......
#!/bin/sh -e
#
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
# shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh"
keyname=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone "dnskey.example.")
cp example.db.in example.db
cat "$keyname.key" >> example.db
echo "$keyname" | sed -e 's/.*[+]//' -e 's/^0*//' > keyid
< "$keyname.key" grep -Ev '^;' | cut -f 7- -d ' ' > keydata
......@@ -9,8 +9,8 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
# shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh"
if $PERL -e 'use Net::DNS;' 2>/dev/null
then
......
......@@ -9,10 +9,12 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
# shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh"
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf
cd ns2 && $SHELL sign.sh
This diff is collapsed.
......@@ -494,6 +494,7 @@
./bin/tests/system/digcomp.pl PERL 2000,2001,2004,2007,2012,2013,2016,2018
./bin/tests/system/digdelv/ans4/startme X 2017,2018
./bin/tests/system/digdelv/clean.sh SH 2015,2016,2018
./bin/tests/system/digdelv/ns2/sign.sh SH 2018
./bin/tests/system/digdelv/prereq.sh SH 2018
./bin/tests/system/digdelv/setup.sh SH 2018
./bin/tests/system/digdelv/tests.sh SH 2015,2016,2017,2018
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment