From d58e33bfabfee19a035031dac633d36659738d56 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 20 Jan 2014 16:08:09 -0800 Subject: [PATCH] [master] testcrypto.sh in system tests 3714. [test] System tests that need to test for cryptography support before running can now use a common "testcrypto.sh" script to do so. [RT #35213] --- CHANGES | 4 ++ bin/tests/system/Makefile.in | 1 + bin/tests/system/autosign/clean.sh | 3 - bin/tests/system/autosign/ns1/keygen.sh | 2 - bin/tests/system/autosign/ns2/keygen.sh | 2 - bin/tests/system/autosign/ns3/keygen.sh | 2 - bin/tests/system/autosign/prereq.sh | 16 +---- bin/tests/system/autosign/setup.sh | 8 +-- bin/tests/system/autosign/tests.sh | 4 -- bin/tests/system/conf.sh.in | 3 + bin/tests/system/coverage/clean.sh | 1 - bin/tests/system/coverage/prereq.sh | 17 +++++ bin/tests/system/coverage/setup.sh | 3 +- bin/tests/system/dlv/clean.sh | 3 - bin/tests/system/dlv/ns1/sign.sh | 2 - bin/tests/system/dlv/ns2/sign.sh | 2 - bin/tests/system/dlv/ns3/sign.sh | 1 - bin/tests/system/dlv/ns6/sign.sh | 4 -- bin/tests/system/dlv/prereq.sh | 17 +++++ bin/tests/system/dlv/setup.sh | 5 +- bin/tests/system/dlvauto/clean.sh | 3 - bin/tests/system/dlvauto/ns1/sign.sh | 4 -- bin/tests/system/dlvauto/prereq.sh | 17 +++++ bin/tests/system/dlvauto/setup.sh | 5 +- bin/tests/system/dlzexternal/clean.sh | 1 - bin/tests/system/dlzexternal/prereq.sh | 4 -- bin/tests/system/dlzexternal/setup.sh | 7 +- bin/tests/system/dns64/clean.sh | 5 +- bin/tests/system/dns64/ns1/sign.sh | 2 - bin/tests/system/dns64/prereq.sh | 17 +++++ bin/tests/system/dns64/setup.sh | 7 +- bin/tests/system/dnssec/clean.sh | 3 - bin/tests/system/dnssec/ns1/sign.sh | 2 - bin/tests/system/dnssec/ns2/sign.sh | 2 - bin/tests/system/dnssec/ns3/sign.sh | 2 - bin/tests/system/dnssec/ns6/sign.sh | 2 - bin/tests/system/dnssec/prereq.sh | 13 +--- bin/tests/system/dnssec/setup.sh | 5 +- bin/tests/system/dnssec/tests.sh | 5 +- bin/tests/system/dsdigest/clean.sh | 3 - bin/tests/system/dsdigest/ns1/sign.sh | 2 - bin/tests/system/dsdigest/ns2/sign.sh | 2 - .../dsdigest/{prereq.sh.in => prereq.sh} | 8 +-- bin/tests/system/dsdigest/setup.sh | 5 +- bin/tests/system/ecdsa/clean.sh | 3 - bin/tests/system/ecdsa/ns1/sign.sh | 4 -- .../system/ecdsa/{prereq.sh.in => prereq.sh} | 16 +---- bin/tests/system/ecdsa/setup.sh | 5 +- bin/tests/system/filter-aaaa/clean.sh | 3 - bin/tests/system/filter-aaaa/ns1/sign.sh | 1 - bin/tests/system/filter-aaaa/ns4/sign.sh | 1 - bin/tests/system/filter-aaaa/prereq.sh | 2 - bin/tests/system/filter-aaaa/setup.sh | 7 +- bin/tests/system/gost/clean.sh | 3 - bin/tests/system/gost/ns1/sign.sh | 4 -- .../system/gost/{prereq.sh.in => prereq.sh} | 16 +---- bin/tests/system/gost/setup.sh | 5 +- bin/tests/system/inline/clean.sh | 3 - bin/tests/system/inline/ns1/sign.sh | 2 - bin/tests/system/inline/ns3/sign.sh | 2 - bin/tests/system/inline/prereq.sh | 17 +++++ bin/tests/system/inline/setup.sh | 9 +-- bin/tests/system/inline/tests.sh | 5 +- bin/tests/system/ixfr/prereq.sh | 2 - bin/tests/system/masterformat/clean.sh | 3 - bin/tests/system/masterformat/ns1/compile.sh | 1 - bin/tests/system/masterformat/prereq.sh | 17 +++++ bin/tests/system/masterformat/setup.sh | 7 +- bin/tests/system/metadata/clean.sh | 4 +- bin/tests/system/metadata/prereq.sh | 13 +--- bin/tests/system/metadata/setup.sh | 8 +-- bin/tests/system/metadata/tests.sh | 1 - bin/tests/system/nsupdate/clean.sh | 3 - bin/tests/system/nsupdate/ns3/sign.sh | 4 -- bin/tests/system/nsupdate/prereq.sh | 17 +++++ bin/tests/system/nsupdate/setup.sh | 19 +++--- bin/tests/system/nsupdate/tests.sh | 2 +- bin/tests/system/pending/clean.sh | 3 - bin/tests/system/pending/ns1/sign.sh | 2 - bin/tests/system/pending/ns2/sign.sh | 2 - bin/tests/system/pending/prereq.sh | 13 +--- bin/tests/system/pending/setup.sh | 5 +- bin/tests/system/pkcs11/clean.sh | 4 +- bin/tests/system/pkcs11/prereq.sh | 14 +--- bin/tests/system/pkcs11/setup.sh | 1 - bin/tests/system/pkcs11/tests.sh | 2 - bin/tests/system/pkcs11ssl/clean.sh | 2 +- bin/tests/system/pkcs11ssl/prereq.sh | 20 +----- bin/tests/system/pkcs11ssl/setup.sh | 1 - bin/tests/system/pkcs11ssl/tests.sh | 2 - bin/tests/system/redirect/clean.sh | 5 +- bin/tests/system/redirect/ns1/sign.sh | 2 - bin/tests/system/redirect/prereq.sh | 17 +++++ bin/tests/system/redirect/setup.sh | 4 +- bin/tests/system/resolver/clean.sh | 3 - bin/tests/system/resolver/ns6/keygen.sh | 2 - bin/tests/system/resolver/prereq.sh | 4 +- bin/tests/system/resolver/setup.sh | 5 +- bin/tests/system/rndc/clean.sh | 3 - bin/tests/system/rndc/setup.sh | 4 +- bin/tests/system/rpz/clean.sh | 6 +- bin/tests/system/rpz/prereq.sh | 17 +++++ bin/tests/system/rpz/setup.sh | 4 +- bin/tests/system/rsabigexponent/bigkey.c | 5 +- bin/tests/system/rsabigexponent/clean.sh | 3 - bin/tests/system/rsabigexponent/ns1/sign.sh | 2 - bin/tests/system/rsabigexponent/ns2/sign.sh | 2 - bin/tests/system/rsabigexponent/prereq.sh | 7 +- bin/tests/system/rsabigexponent/setup.sh | 7 +- bin/tests/system/run.sh | 1 + bin/tests/system/smartsign/clean.sh | 4 +- bin/tests/system/smartsign/prereq.sh | 13 +--- bin/tests/system/smartsign/setup.sh | 5 +- bin/tests/system/smartsign/tests.sh | 2 - bin/tests/system/staticstub/clean.sh | 3 - bin/tests/system/staticstub/ns3/sign.sh | 2 - bin/tests/system/staticstub/ns4/sign.sh | 2 - bin/tests/system/staticstub/prereq.sh | 17 +++++ bin/tests/system/staticstub/setup.sh | 5 +- bin/tests/system/statistics/prereq.sh | 2 - bin/tests/system/testcrypto.sh | 68 +++++++++++++++++++ bin/tests/system/tkey/clean.sh | 4 +- bin/tests/system/tkey/keycreate.c | 2 +- bin/tests/system/tkey/keydelete.c | 2 +- bin/tests/system/tkey/ns1/named.conf.in | 1 + bin/tests/system/tkey/ns1/setup.sh | 7 +- bin/tests/system/tkey/prereq.sh | 13 +--- bin/tests/system/tkey/setup.sh | 7 +- bin/tests/system/tkey/tests.sh | 2 - bin/tests/system/tsiggss/clean.sh | 1 - bin/tests/system/tsiggss/prereq.sh | 9 +-- bin/tests/system/tsiggss/setup.sh | 5 +- bin/tests/system/tsiggss/tests.sh | 2 +- bin/tests/system/unknown/ns3/sign.sh | 2 - bin/tests/system/unknown/prereq.sh | 17 +++++ bin/tests/system/unknown/setup.sh | 8 +-- bin/tests/system/upforwd/prereq.sh | 2 - bin/tests/system/verify/clean.sh | 3 - bin/tests/system/verify/prereq.sh | 17 +++++ bin/tests/system/verify/setup.sh | 6 +- bin/tests/system/verify/zones/genzones.sh | 2 - bin/tests/system/wildcard/clean.sh | 3 - bin/tests/system/wildcard/ns1/sign.sh | 1 - bin/tests/system/wildcard/prereq.sh | 17 +++++ bin/tests/system/wildcard/setup.sh | 5 +- bin/tests/system/xfer/prereq.sh | 2 - bin/tests/system/zonechecks/clean.sh | 3 - bin/tests/system/zonechecks/prereq.sh | 17 +++++ bin/tests/system/zonechecks/setup.sh | 9 +-- configure | 5 +- configure.in | 3 - lib/dns/tests/gost_test.c | 2 +- lib/dns/tests/nsec3_test.c | 17 ++++- util/copyrights | 25 +++++-- 154 files changed, 493 insertions(+), 460 deletions(-) create mode 100644 bin/tests/system/coverage/prereq.sh create mode 100644 bin/tests/system/dlv/prereq.sh create mode 100644 bin/tests/system/dlvauto/prereq.sh create mode 100644 bin/tests/system/dns64/prereq.sh rename bin/tests/system/dsdigest/{prereq.sh.in => prereq.sh} (85%) rename bin/tests/system/ecdsa/{prereq.sh.in => prereq.sh} (72%) rename bin/tests/system/gost/{prereq.sh.in => prereq.sh} (70%) create mode 100644 bin/tests/system/inline/prereq.sh create mode 100755 bin/tests/system/masterformat/prereq.sh create mode 100644 bin/tests/system/nsupdate/prereq.sh create mode 100644 bin/tests/system/redirect/prereq.sh create mode 100644 bin/tests/system/rpz/prereq.sh create mode 100755 bin/tests/system/staticstub/prereq.sh create mode 100644 bin/tests/system/testcrypto.sh create mode 100644 bin/tests/system/unknown/prereq.sh create mode 100644 bin/tests/system/verify/prereq.sh create mode 100644 bin/tests/system/wildcard/prereq.sh create mode 100644 bin/tests/system/zonechecks/prereq.sh diff --git a/CHANGES b/CHANGES index 4c254f2f01..c681eb28a4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +3714. [test] System tests that need to test for cryptography + support before running can now use a common + "testcrypto.sh" script to do so. [RT #35213] + 3713. [bug] Save memory by not storing "also-notify" addresses in zone objects that are configured not to send notify requests. [RT #35195] diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 27bc585e5b..71e72bbc04 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -37,6 +37,7 @@ test: subdirs testclean clean distclean:: if test -f ./cleanall.sh; then sh ./cleanall.sh; fi rm -f systests.output + rm -f random.data distclean:: rm -f conf.sh diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh index 6628f0d04c..0c15042bce 100644 --- a/bin/tests/system/autosign/clean.sh +++ b/bin/tests/system/autosign/clean.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.15 2012/02/06 23:46:45 tbox Exp $ - rm -f */K* */dsset-* */*.signed */trusted.conf */tmp* */*.jnl */*.bk rm -f active.key inact.key del.key unpub.key standby.key rev.key rm -f nopriv.key vanishing.key del1.key del2.key @@ -26,7 +24,6 @@ rm -f */core rm -f */example.bk rm -f */named.memstats rm -f dig.out.* -rm -f random.data rm -f ns1/root.db rm -f ns2/example.db rm -f ns2/private.secure.example.db ns2/bar.db diff --git a/bin/tests/system/autosign/ns1/keygen.sh b/bin/tests/system/autosign/ns1/keygen.sh index b2e5aa8af2..2df0b943ba 100644 --- a/bin/tests/system/autosign/ns1/keygen.sh +++ b/bin/tests/system/autosign/ns1/keygen.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. zonefile=root.db infile=root.db.in diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh index 98332b9cf9..48ecf09e60 100644 --- a/bin/tests/system/autosign/ns2/keygen.sh +++ b/bin/tests/system/autosign/ns2/keygen.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - # Have the child generate subdomain keys and pass DS sets to us. ( cd ../ns3 && sh keygen.sh ) diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh index 662b2537cf..f04c382f4c 100644 --- a/bin/tests/system/autosign/ns3/keygen.sh +++ b/bin/tests/system/autosign/ns3/keygen.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - dumpit () { echo "D:${debug}: dumping ${1}" cat "${1}" | sed 's/^/D:/' diff --git a/bin/tests/system/autosign/prereq.sh b/bin/tests/system/autosign/prereq.sh index 0fe8ba1b28..9991a55fbf 100644 --- a/bin/tests/system/autosign/prereq.sh +++ b/bin/tests/system/autosign/prereq.sh @@ -14,18 +14,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.5 2010/01/18 23:48:39 tbox Exp $ - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh - -../../../tools/genrandom 400 random.data - -if $KEYGEN -q -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1 -then - rm -f Kfoo* -else - echo "I:This test requires cryptography" >&2 - echo "I:--with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 - exit 1 -fi +exec sh ../testcrypto.sh diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh index 0f615d5358..a559ee92aa 100644 --- a/bin/tests/system/autosign/setup.sh +++ b/bin/tests/system/autosign/setup.sh @@ -14,14 +14,12 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.5 2010/01/18 23:48:39 tbox Exp $ - SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh + . ./clean.sh +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE + echo "I:generating keys and preparing zones" - -../../../tools/genrandom 400 random.data - cd ns1 && sh keygen.sh diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh index 9d72fed878..3f107d2e75 100644 --- a/bin/tests/system/autosign/tests.sh +++ b/bin/tests/system/autosign/tests.sh @@ -14,13 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=random.data - status=0 n=0 diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 857c4e3ab3..80141341d5 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -56,6 +56,9 @@ VERIFY=$TOP/bin/dnssec/dnssec-verify ARPANAME=$TOP/bin/tools/arpaname RESOLVE=$TOP/lib/samples/resolve RRCHECKER=$TOP/bin/tools/named-rrchecker +GENRANDOM=$TOP/bin/tools/genrandom + +RANDFILE=$TOP/bin/tests/system/random.data # The "stress" test is not run by default since it creates enough # load on the machine to make it unusable to other users. diff --git a/bin/tests/system/coverage/clean.sh b/bin/tests/system/coverage/clean.sh index 8e68e2c33e..5068a17bf3 100644 --- a/bin/tests/system/coverage/clean.sh +++ b/bin/tests/system/coverage/clean.sh @@ -18,4 +18,3 @@ rm -f named-compilezone rm -f */K*.key rm -f */K*.private rm -rf coverage.* -rm -f random.data diff --git a/bin/tests/system/coverage/prereq.sh b/bin/tests/system/coverage/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/coverage/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/coverage/setup.sh b/bin/tests/system/coverage/setup.sh index bd3e9a413f..d8f3f7cb45 100644 --- a/bin/tests/system/coverage/setup.sh +++ b/bin/tests/system/coverage/setup.sh @@ -17,12 +17,11 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -KEYGEN="$KEYGEN -qr random.data" +KEYGEN="$KEYGEN -qr $RANDFILE" sh clean.sh ln -s $CHECKZONE named-compilezone -../../../tools/genrandom 400 random.data # Test 1: KSK goes inactive before successor is active dir=01-ksk-inactive diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh index 2b10e49f70..030737a998 100644 --- a/bin/tests/system/dlv/clean.sh +++ b/bin/tests/system/dlv/clean.sh @@ -14,9 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.9 2011/05/26 23:47:28 tbox Exp $ - -rm -f random.data rm -f ns*/named.run rm -f ns1/K* rm -f ns1/dsset-* diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh index 9854f5b7ce..1478dd7218 100755 --- a/bin/tests/system/dlv/ns1/sign.sh +++ b/bin/tests/system/dlv/ns1/sign.sh @@ -23,8 +23,6 @@ echo "I:dlv/ns1/sign.sh" SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh index edcc8f21d4..947a58f1c9 100755 --- a/bin/tests/system/dlv/ns2/sign.sh +++ b/bin/tests/system/dlv/ns2/sign.sh @@ -23,8 +23,6 @@ echo "I:dlv/ns2/sign.sh" SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=druz. infile=druz.db.in zonefile=druz.db diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh index 6bdc2f6cc5..115a4d2268 100755 --- a/bin/tests/system/dlv/ns3/sign.sh +++ b/bin/tests/system/dlv/ns3/sign.sh @@ -23,7 +23,6 @@ echo "I:dlv/ns3/sign.sh" SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data dlvzone=dlv.utld. dlvsets= dssets= diff --git a/bin/tests/system/dlv/ns6/sign.sh b/bin/tests/system/dlv/ns6/sign.sh index 2bc133e5d6..610f9974f2 100755 --- a/bin/tests/system/dlv/ns6/sign.sh +++ b/bin/tests/system/dlv/ns6/sign.sh @@ -14,15 +14,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.5 2011/05/26 23:47:28 tbox Exp $ - SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh echo "I:dlv/ns6/sign.sh" -RANDFILE=../random.data - zone=grand.child1.utld. infile=child.db.in zonefile=grand.child1.utld.db diff --git a/bin/tests/system/dlv/prereq.sh b/bin/tests/system/dlv/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/dlv/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh index 92ee8fca02..2454a4a376 100644 --- a/bin/tests/system/dlv/setup.sh +++ b/bin/tests/system/dlv/setup.sh @@ -14,8 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.8 2011/05/26 23:47:28 tbox Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE (cd ns1 && sh -e sign.sh) diff --git a/bin/tests/system/dlvauto/clean.sh b/bin/tests/system/dlvauto/clean.sh index dc3faa8483..cfa5b62f65 100644 --- a/bin/tests/system/dlvauto/clean.sh +++ b/bin/tests/system/dlvauto/clean.sh @@ -12,9 +12,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.3 2011/03/03 16:16:43 each Exp $ - -rm -f random.data rm -f ns1/K* rm -f ns1/*.signed rm -f ns1/*.db diff --git a/bin/tests/system/dlvauto/ns1/sign.sh b/bin/tests/system/dlvauto/ns1/sign.sh index 4c7f48044d..3a6330004e 100644 --- a/bin/tests/system/dlvauto/ns1/sign.sh +++ b/bin/tests/system/dlvauto/ns1/sign.sh @@ -14,13 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.3 2011/03/03 16:16:46 each Exp $ - SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=dlv.isc.org infile=dlv.isc.org.db.in zonefile=dlv.isc.org.db diff --git a/bin/tests/system/dlvauto/prereq.sh b/bin/tests/system/dlvauto/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/dlvauto/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/dlvauto/setup.sh b/bin/tests/system/dlvauto/setup.sh index 6c9df26f7b..20f21dbb6a 100644 --- a/bin/tests/system/dlvauto/setup.sh +++ b/bin/tests/system/dlvauto/setup.sh @@ -14,10 +14,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2 2011/03/01 22:44:04 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh sh clean.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh sign.sh diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh index f5fb8e4024..85cef75008 100644 --- a/bin/tests/system/dlzexternal/clean.sh +++ b/bin/tests/system/dlzexternal/clean.sh @@ -6,5 +6,4 @@ rm -f ns1/update.txt rm -f */named.memstats rm -f ns1/ddns.key -rm -f random.data rm -f dig.out* diff --git a/bin/tests/system/dlzexternal/prereq.sh b/bin/tests/system/dlzexternal/prereq.sh index a8837a0aae..bd32afa81f 100644 --- a/bin/tests/system/dlzexternal/prereq.sh +++ b/bin/tests/system/dlzexternal/prereq.sh @@ -14,10 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.7 2011/03/20 09:03:47 marka Exp $ - -TOP=${SYSTEMTESTTOP:=.}/../../../.. - ./dlopen || { echo "I:dlopen() not supported - skipping dlzexternal test" exit 255 diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh index f4bf9d084b..696e200fbe 100644 --- a/bin/tests/system/dlzexternal/setup.sh +++ b/bin/tests/system/dlzexternal/setup.sh @@ -14,10 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.3 2010/12/20 23:47:20 tbox Exp $ - SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data -$DDNSCONFGEN -q -r random.data -z example.nil > ns1/ddns.key +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE + +$DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key diff --git a/bin/tests/system/dns64/clean.sh b/bin/tests/system/dns64/clean.sh index a5bd33c693..7ebc771d62 100644 --- a/bin/tests/system/dns64/clean.sh +++ b/bin/tests/system/dns64/clean.sh @@ -14,11 +14,8 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.4 2010/12/18 02:12:43 each Exp $ - - rm -f ns1/K* rm -f ns1/signed.db* rm -f ns1/dsset-signed. rm -f */named.memstats -rm -f dig.out.* random.data +rm -f dig.out.* diff --git a/bin/tests/system/dns64/ns1/sign.sh b/bin/tests/system/dns64/ns1/sign.sh index 620096cda1..5a79d0947d 100644 --- a/bin/tests/system/dns64/ns1/sign.sh +++ b/bin/tests/system/dns64/ns1/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=signed infile=example.db zonefile=signed.db diff --git a/bin/tests/system/dns64/prereq.sh b/bin/tests/system/dns64/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/dns64/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh index c15357cb9d..8b2b01c3a8 100644 --- a/bin/tests/system/dns64/setup.sh +++ b/bin/tests/system/dns64/setup.sh @@ -14,10 +14,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.4 2010/12/18 11:45:01 marka Exp $ - sh clean.sh -../../../tools/genrandom 400 random.data +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh sign.sh diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index f97e885002..e25a3a553a 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -15,8 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.48 2012/02/22 23:47:34 tbox Exp $ - rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed rm -f */trusted.conf */managed.conf */tmp* */*.jnl */*.bk */*.jbk rm -f ns1/root.db ns2/example.db ns3/secure.example.db @@ -32,7 +30,6 @@ rm -f ns2/nsec3chain-test.db rm -f */example.bk rm -f dig.out.* rm -f resolve.out* -rm -f random.data rm -f ns2/dlv.db rm -f ns3/multiple.example.db ns3/nsec3-unknown.example.db ns3/nsec3.example.db rm -f ns3/optout-unknown.example.db ns3/optout.example.db diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh index 8fac885868..54bf8dc3cd 100644 --- a/bin/tests/system/dnssec/ns1/sign.sh +++ b/bin/tests/system/dnssec/ns1/sign.sh @@ -20,8 +20,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh index 5b5d337a5d..52290e4398 100644 --- a/bin/tests/system/dnssec/ns2/sign.sh +++ b/bin/tests/system/dnssec/ns2/sign.sh @@ -20,8 +20,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=example. infile=example.db.in zonefile=example.db diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh index d5ec859519..2ad13cab3b 100644 --- a/bin/tests/system/dnssec/ns3/sign.sh +++ b/bin/tests/system/dnssec/ns3/sign.sh @@ -20,8 +20,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=secure.example. infile=secure.example.db.in zonefile=secure.example.db diff --git a/bin/tests/system/dnssec/ns6/sign.sh b/bin/tests/system/dnssec/ns6/sign.sh index e6125ddf61..b6e21cd640 100644 --- a/bin/tests/system/dnssec/ns6/sign.sh +++ b/bin/tests/system/dnssec/ns6/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=optout-tld infile=optout-tld.db.in zonefile=optout-tld.db diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh index b0a4c58c69..3edb961113 100644 --- a/bin/tests/system/dnssec/prereq.sh +++ b/bin/tests/system/dnssec/prereq.sh @@ -15,15 +15,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.13 2009/10/28 00:27:10 marka Exp $ - -../../../tools/genrandom 400 random.data - -if $KEYGEN -q -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1 -then - rm -f Kfoo* -else - echo "I:This test requires cryptography" >&2 - echo "I:--with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 - exit 1 -fi +exec sh ../testcrypto.sh diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh index 4ac5421d14..f0170aeeb1 100644 --- a/bin/tests/system/dnssec/setup.sh +++ b/bin/tests/system/dnssec/setup.sh @@ -15,11 +15,12 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.20 2011/02/15 22:02:36 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh sh clean.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh sign.sh diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index e6f04e3d1a..e41aeec26d 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -20,8 +20,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=random.data - status=0 n=1 @@ -1741,7 +1739,7 @@ echo "I:checking that the NSEC3 record for the apex is properly signed when a DN ret=0 ( cd ns3 -kskname=`$KEYGEN -q -3 -r ../random.data -fk update-nsec3.example` +kskname=`$KEYGEN -q -3 -r $RANDFILE -fk update-nsec3.example` ( echo zone update-nsec3.example echo server 10.53.0.3 5300 @@ -2115,7 +2113,6 @@ ret=0 $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 freeze expiring.example 2>&1 | sed 's/^/I:ns3 /' ( cd ns3 -RANDFILE=../random.data for file in K*.moved; do mv $file `basename $file .moved` done diff --git a/bin/tests/system/dsdigest/clean.sh b/bin/tests/system/dsdigest/clean.sh index 1e384d0046..8ff525af15 100644 --- a/bin/tests/system/dsdigest/clean.sh +++ b/bin/tests/system/dsdigest/clean.sh @@ -14,14 +14,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - rm -f supported rm -f */K* */dsset-* */*.signed */trusted.conf rm -f ns1/root.db rm -f ns1/signer.err rm -f ns2/good.db ns2/bad.db rm -f dig.out* -rm -f random.data rm -f */named.run rm -f */named.memstats diff --git a/bin/tests/system/dsdigest/ns1/sign.sh b/bin/tests/system/dsdigest/ns1/sign.sh index b8115f6f62..61b81f2a51 100644 --- a/bin/tests/system/dsdigest/ns1/sign.sh +++ b/bin/tests/system/dsdigest/ns1/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/dsdigest/ns2/sign.sh b/bin/tests/system/dsdigest/ns2/sign.sh index 802367798d..8d4fa780b0 100644 --- a/bin/tests/system/dsdigest/ns2/sign.sh +++ b/bin/tests/system/dsdigest/ns2/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone1=good. infile1=good.db.in zonefile1=good.db diff --git a/bin/tests/system/dsdigest/prereq.sh.in b/bin/tests/system/dsdigest/prereq.sh similarity index 85% rename from bin/tests/system/dsdigest/prereq.sh.in rename to bin/tests/system/dsdigest/prereq.sh index 5cddb4ca25..ef21ed5ba8 100644 --- a/bin/tests/system/dsdigest/prereq.sh.in +++ b/bin/tests/system/dsdigest/prereq.sh @@ -14,16 +14,12 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data gostfail=0 ecdsafail=0 -$KEYGEN -q -a eccgost test > /dev/null 2>&1 || gostfail=1 -$KEYGEN -q -a ecdsap256sha256 test > /dev/null 2>&1 || ecdsafail=1 -rm -f Ktest* random.data +sh ../testcrypto.sh -q gost || gostfail=1 +sh ../testcrypto.sh -q ecdsa || ecdsafail=1 if [ $gostfail = 0 -a $ecdsafail = 0 ]; then echo both > supported diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh index 6ba0f72c3e..68d34e5bf2 100644 --- a/bin/tests/system/dsdigest/setup.sh +++ b/bin/tests/system/dsdigest/setup.sh @@ -14,8 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh sign.sh diff --git a/bin/tests/system/ecdsa/clean.sh b/bin/tests/system/ecdsa/clean.sh index 5a2a42ad56..a7c1a0e0e0 100644 --- a/bin/tests/system/ecdsa/clean.sh +++ b/bin/tests/system/ecdsa/clean.sh @@ -14,12 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - rm -f */K* */dsset-* */*.signed */trusted.conf rm -f ns1/root.db rm -f ns1/signer.err rm -f dig.out* -rm -f random.data rm -f */named.run rm -f */named.memstats diff --git a/bin/tests/system/ecdsa/ns1/sign.sh b/bin/tests/system/ecdsa/ns1/sign.sh index 71b7390074..f4373bfdcb 100644 --- a/bin/tests/system/ecdsa/ns1/sign.sh +++ b/bin/tests/system/ecdsa/ns1/sign.sh @@ -14,13 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/ecdsa/prereq.sh.in b/bin/tests/system/ecdsa/prereq.sh similarity index 72% rename from bin/tests/system/ecdsa/prereq.sh.in rename to bin/tests/system/ecdsa/prereq.sh index a52fd795b9..8a6b44fdfc 100644 --- a/bin/tests/system/ecdsa/prereq.sh.in +++ b/bin/tests/system/ecdsa/prereq.sh @@ -14,18 +14,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data - -fail=0 -$KEYGEN -q -a ecdsap256sha256 test > /dev/null 2>&1 || fail=1 -rm -f Ktest* random.data - -if [ $fail != 0 ] -then - echo "I:This test requires support for ECDSA cryptography." >&2 - exit 255 -fi +exec sh ../testcrypto.sh ecdsa diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh index 6ba0f72c3e..68d34e5bf2 100644 --- a/bin/tests/system/ecdsa/setup.sh +++ b/bin/tests/system/ecdsa/setup.sh @@ -14,8 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh sign.sh diff --git a/bin/tests/system/filter-aaaa/clean.sh b/bin/tests/system/filter-aaaa/clean.sh index f73a54275f..7df2517f45 100644 --- a/bin/tests/system/filter-aaaa/clean.sh +++ b/bin/tests/system/filter-aaaa/clean.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.2 2010/06/22 03:58:36 marka Exp $ - rm -f ns1/K* rm -f ns1/*.signed rm -f ns1/signer.err @@ -36,5 +34,4 @@ rm -f ns4/dsset-* rm -f ns4/named.run ns4/named.conf rm -f ns4/named.memstats -rm -f random.data rm -f dig.out.* diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh index 203e37ebfb..e5d66b6777 100755 --- a/bin/tests/system/filter-aaaa/ns1/sign.sh +++ b/bin/tests/system/filter-aaaa/ns1/sign.sh @@ -19,7 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data dlvsets= zone=signed. diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter-aaaa/ns4/sign.sh index ff33b10a19..6663f3e42e 100755 --- a/bin/tests/system/filter-aaaa/ns4/sign.sh +++ b/bin/tests/system/filter-aaaa/ns4/sign.sh @@ -19,7 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data dlvsets= zone=signed. diff --git a/bin/tests/system/filter-aaaa/prereq.sh b/bin/tests/system/filter-aaaa/prereq.sh index 486067de81..37a822cba5 100644 --- a/bin/tests/system/filter-aaaa/prereq.sh +++ b/bin/tests/system/filter-aaaa/prereq.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.2 2010/06/22 03:58:36 marka Exp $ - if ./filter-aaaa then : diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh index 44147b0a02..9f78dce7b0 100644 --- a/bin/tests/system/filter-aaaa/setup.sh +++ b/bin/tests/system/filter-aaaa/setup.sh @@ -14,11 +14,12 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2 2010/06/22 03:58:36 marka Exp $ - sh clean.sh -../../../tools/genrandom 400 random.data +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cp ns1/named1.conf ns1/named.conf cp ns2/named1.conf ns2/named.conf diff --git a/bin/tests/system/gost/clean.sh b/bin/tests/system/gost/clean.sh index bf62b275d6..8ebbb24385 100644 --- a/bin/tests/system/gost/clean.sh +++ b/bin/tests/system/gost/clean.sh @@ -14,12 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.2 2010/12/23 04:07:59 marka Exp $ - rm -f */K* */dsset-* */*.signed */trusted.conf rm -f ns1/root.db rm -f ns1/signer.err rm -f dig.out* -rm -f random.data rm -f */named.run rm -f */named.memstats diff --git a/bin/tests/system/gost/ns1/sign.sh b/bin/tests/system/gost/ns1/sign.sh index 854258f03b..606c1e69c3 100644 --- a/bin/tests/system/gost/ns1/sign.sh +++ b/bin/tests/system/gost/ns1/sign.sh @@ -14,13 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.2 2010/12/23 04:08:00 marka Exp $ - SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/gost/prereq.sh.in b/bin/tests/system/gost/prereq.sh similarity index 70% rename from bin/tests/system/gost/prereq.sh.in rename to bin/tests/system/gost/prereq.sh index 4b0eeb3ad2..a49e8ff9c1 100644 --- a/bin/tests/system/gost/prereq.sh.in +++ b/bin/tests/system/gost/prereq.sh @@ -14,18 +14,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh.in,v 1.4 2010/12/27 13:38:43 marka Exp $ - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data - -fail=0 -$KEYGEN -q -a eccgost test > /dev/null 2>&1 || fail=1 -rm -f Ktest* random.data - -if [ $fail != 0 ] -then - echo "I:This test requires support for GOST cryptography." >&2 - exit 255 -fi +exec sh ../testcrypto.sh gost diff --git a/bin/tests/system/gost/setup.sh b/bin/tests/system/gost/setup.sh index bfa5f3eb8f..76516019dd 100644 --- a/bin/tests/system/gost/setup.sh +++ b/bin/tests/system/gost/setup.sh @@ -14,8 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2 2010/12/23 04:08:00 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh sign.sh diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh index cbbbbb87fd..f5fc31da78 100644 --- a/bin/tests/system/inline/clean.sh +++ b/bin/tests/system/inline/clean.sh @@ -12,8 +12,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.13 2012/02/23 06:53:15 marka Exp $ - rm -f */named.memstats rm -f */named.run rm -f */trusted.conf @@ -77,7 +75,6 @@ rm -f ns5/bits.bk.jnl rm -f ns5/bits.bk.signed rm -f ns5/bits.bk.signed.jnl rm -f */*.jbk -rm -f random.data rm -f dig.out.ns* rm -f signing.out* rm -f freeze.test* diff --git a/bin/tests/system/inline/ns1/sign.sh b/bin/tests/system/inline/ns1/sign.sh index cf08f59ee7..7be6513b4f 100644 --- a/bin/tests/system/inline/ns1/sign.sh +++ b/bin/tests/system/inline/ns1/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. rm -f K.+*+*.key rm -f K.+*+*.private diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh index f95ccffe1a..8ffb5984aa 100755 --- a/bin/tests/system/inline/ns3/sign.sh +++ b/bin/tests/system/inline/ns3/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=bits rm -f K${zone}.+*+*.key rm -f K${zone}.+*+*.private diff --git a/bin/tests/system/inline/prereq.sh b/bin/tests/system/inline/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/inline/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh index adee4ffb02..c2c8fb9b25 100644 --- a/bin/tests/system/inline/setup.sh +++ b/bin/tests/system/inline/setup.sh @@ -12,10 +12,13 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.11 2012/02/23 06:53:15 marka Exp $ - sh clean.sh +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE + cp ns1/root.db.in ns1/root.db rm -f ns1/root.db.signed @@ -37,7 +40,5 @@ rm -f ns4/noixfr.db.jnl cp ns5/named.conf.pre ns5/named.conf -../../../tools/genrandom 400 random.data - (cd ns3; sh -e sign.sh) (cd ns1; sh -e sign.sh) diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 36eb47a04b..330cf147f0 100755 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -20,7 +20,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh DIGOPTS="+tcp +dnssec" -RANDFILE=random.data status=0 n=0 @@ -623,8 +622,8 @@ grep "ANSWER: 1," dig.out.ns5.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo "I:setup broken"; fi status=`expr $status + $ret` cp ns5/named.conf.post ns5/named.conf -(cd ns5; $KEYGEN -q -r ../$RANDFILE bits) > /dev/null 2>&1 -(cd ns5; $KEYGEN -q -r ../$RANDFILE -f KSK bits) > /dev/null 2>&1 +(cd ns5; $KEYGEN -q -r $RANDFILE bits) > /dev/null 2>&1 +(cd ns5; $KEYGEN -q -r $RANDFILE -f KSK bits) > /dev/null 2>&1 $RNDC -c ../common/rndc.conf -s 10.53.0.5 -p 9953 reload 2>&1 | sed 's/^/I:ns5 /' for i in 1 2 3 4 5 6 7 8 9 10 do diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh index 7218ee64a6..c8561434e8 100644 --- a/bin/tests/system/ixfr/prereq.sh +++ b/bin/tests/system/ixfr/prereq.sh @@ -15,8 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.5 2007/06/19 23:47:03 tbox Exp $ - if $PERL -e 'use Net::DNS;' 2>/dev/null then : diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh index e0bd3afe32..287cbd3623 100755 --- a/bin/tests/system/masterformat/clean.sh +++ b/bin/tests/system/masterformat/clean.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - rm -f named-compilezone rm -f ns1/example.db.raw* rm -f ns1/example.db.compat @@ -34,5 +32,4 @@ rm -f ns2/large.bk rm -f ns3/example.db.map ns3/dynamic.db.map rm -f baseline.txt text.1 text.2 raw.1 raw.2 map.1 map.2 map.5 text.5 badmap rm -f ns1/Ksigned.* ns1/dsset-signed. ns1/signed.db.signed -rm -f random.data rm -f rndc.out diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh index 34e7a659fc..f32bdc2506 100755 --- a/bin/tests/system/masterformat/ns1/compile.sh +++ b/bin/tests/system/masterformat/ns1/compile.sh @@ -16,7 +16,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data ../named-compilezone -D -F raw -o example.db.raw example \ example.db > /dev/null 2>&1 diff --git a/bin/tests/system/masterformat/prereq.sh b/bin/tests/system/masterformat/prereq.sh new file mode 100755 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/masterformat/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh index 233f3e6a40..0cf9665239 100755 --- a/bin/tests/system/masterformat/setup.sh +++ b/bin/tests/system/masterformat/setup.sh @@ -12,13 +12,14 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.11 2012/02/14 23:47:15 tbox Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE rm -f named-compilezone ln -s $CHECKZONE named-compilezone -../../../tools/genrandom 400 random.data - rm -f ns1/example.db.raw cp ns1/example.db ns2/ cp ns2/formerly-text.db.in ns2/formerly-text.db diff --git a/bin/tests/system/metadata/clean.sh b/bin/tests/system/metadata/clean.sh index 3c33e9dc61..18d45b6bd5 100644 --- a/bin/tests/system/metadata/clean.sh +++ b/bin/tests/system/metadata/clean.sh @@ -14,9 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.5 2011/03/21 23:47:21 tbox Exp $ - -rm -f K* dsset-* *.signed *.new random.data +rm -f K* dsset-* *.signed *.new rm -f zsk.key ksk.key parent.ksk.key parent.zsk.key rm -f pending.key rolling.key standby.key inact.key rm -f prerev.key postrev.key oldstyle.key diff --git a/bin/tests/system/metadata/prereq.sh b/bin/tests/system/metadata/prereq.sh index 0ff7d25d0c..130935906c 100644 --- a/bin/tests/system/metadata/prereq.sh +++ b/bin/tests/system/metadata/prereq.sh @@ -14,15 +14,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $ - -../../../tools/genrandom 400 random.data - -if $KEYGEN -q -r random.data foo > /dev/null 2>&1 -then - rm -f Kfoo* -else - echo "I:This test requires cryptography" >&2 - echo "I:--with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 - exit 1 -fi +exec sh ../testcrypto.sh diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh index d5b768926c..95a65f0035 100644 --- a/bin/tests/system/metadata/setup.sh +++ b/bin/tests/system/metadata/setup.sh @@ -14,19 +14,15 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.5 2011/03/21 23:47:21 tbox Exp $ - SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -. ./clean.sh +sh ./clean.sh -RANDFILE=./random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE pzone=parent.nil czone=child.parent.nil -../../../tools/genrandom 400 $RANDFILE - echo "I:generating keys" # active zsk diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh index e2abe2f99b..59b914768b 100644 --- a/bin/tests/system/metadata/tests.sh +++ b/bin/tests/system/metadata/tests.sh @@ -19,7 +19,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=./random.data pzone=parent.nil pfile=parent.db czone=child.parent.nil cfile=child.db status=0 diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh index f8654d65d3..bd519d671f 100644 --- a/bin/tests/system/nsupdate/clean.sh +++ b/bin/tests/system/nsupdate/clean.sh @@ -15,8 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.25 2011/07/01 02:25:47 marka Exp $ - # # Clean up after zone transfer tests. # @@ -26,7 +24,6 @@ rm -f ns1/example.db ns1/unixtime.db ns1/update.db ns1/other.db ns1/keytests.db rm -f ns1/md5.key ns1/sha1.key ns1/sha224.key ns1/sha256.key ns1/sha384.key rm -f ns1/sha512.key ns1/ddns.key rm -f nsupdate.out -rm -f random.data rm -f ns2/example.bk rm -f ns2/update.bk ns2/update.alt.bk rm -f */named.memstats diff --git a/bin/tests/system/nsupdate/ns3/sign.sh b/bin/tests/system/nsupdate/ns3/sign.sh index e0b947c51f..0baa005100 100644 --- a/bin/tests/system/nsupdate/ns3/sign.sh +++ b/bin/tests/system/nsupdate/ns3/sign.sh @@ -14,13 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.4 2011/02/03 12:18:11 tbox Exp $ - SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=nsec3param.test. infile=nsec3param.test.db.in zonefile=nsec3param.test.db diff --git a/bin/tests/system/nsupdate/prereq.sh b/bin/tests/system/nsupdate/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/nsupdate/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh index bb015142da..96d349842f 100644 --- a/bin/tests/system/nsupdate/setup.sh +++ b/bin/tests/system/nsupdate/setup.sh @@ -15,11 +15,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.19 2011/07/01 02:25:47 marka Exp $ - SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE + # # jnl and database files MUST be removed before we start # @@ -51,14 +51,13 @@ ns1.update.nil. A 10.53.0.2 ns2.update.nil. AAAA ::1 EOF -../../../tools/genrandom 400 random.data -$DDNSCONFGEN -q -r random.data -z example.nil > ns1/ddns.key +$DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key -$DDNSCONFGEN -q -r random.data -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key -$DDNSCONFGEN -q -r random.data -a hmac-sha1 -k sha1-key -z keytests.nil > ns1/sha1.key -$DDNSCONFGEN -q -r random.data -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key -$DDNSCONFGEN -q -r random.data -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key -$DDNSCONFGEN -q -r random.data -a hmac-sha384 -k sha384-key -z keytests.nil > ns1/sha384.key -$DDNSCONFGEN -q -r random.data -a hmac-sha512 -k sha512-key -z keytests.nil > ns1/sha512.key +$DDNSCONFGEN -q -r $RANDFILE -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key +$DDNSCONFGEN -q -r $RANDFILE -a hmac-sha1 -k sha1-key -z keytests.nil > ns1/sha1.key +$DDNSCONFGEN -q -r $RANDFILE -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key +$DDNSCONFGEN -q -r $RANDFILE -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key +$DDNSCONFGEN -q -r $RANDFILE -a hmac-sha384 -k sha384-key -z keytests.nil > ns1/sha384.key +$DDNSCONFGEN -q -r $RANDFILE -a hmac-sha512 -k sha512-key -z keytests.nil > ns1/sha512.key (cd ns3; sh -e sign.sh) diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh index 762d96eeb3..6edb6314cf 100644 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh @@ -169,7 +169,7 @@ grep ns6.other.nil dig.out.ns1 > /dev/null 2>&1 || ret=1 ret=0 echo "I:check SIG(0) key is accepted" -key=`$KEYGEN -q -r random.data -a NSEC3RSASHA1 -b 512 -T KEY -n ENTITY xxx` +key=`$KEYGEN -q -r $RANDFILE -a NSEC3RSASHA1 -b 512 -T KEY -n ENTITY xxx` echo "" | $NSUPDATE -k ${key}.private > /dev/null 2>&1 || ret=1 [ $ret = 0 ] || { echo I:failed; status=1; } diff --git a/bin/tests/system/pending/clean.sh b/bin/tests/system/pending/clean.sh index ec0bcc2494..e8055e9f4f 100644 --- a/bin/tests/system/pending/clean.sh +++ b/bin/tests/system/pending/clean.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.4 2009/12/30 08:02:22 jinmei Exp $ - rm -rf */*.signed rm -rf */*.jnl rm -rf */K* @@ -26,5 +24,4 @@ rm -rf */trusted.conf rm -rf ns1/root.db rm -rf ns2/example.db rm -rf ns2/example.com.db -rm -rf random.data rm -rf nsupdate.out.test diff --git a/bin/tests/system/pending/ns1/sign.sh b/bin/tests/system/pending/ns1/sign.sh index c14115b9c9..ffe0e650ed 100644 --- a/bin/tests/system/pending/ns1/sign.sh +++ b/bin/tests/system/pending/ns1/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh index e9c781673a..76283089a6 100644 --- a/bin/tests/system/pending/ns2/sign.sh +++ b/bin/tests/system/pending/ns2/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - for domain in example example.com; do zone=${domain}. infile=${domain}.db.in diff --git a/bin/tests/system/pending/prereq.sh b/bin/tests/system/pending/prereq.sh index 01f29881fc..130935906c 100644 --- a/bin/tests/system/pending/prereq.sh +++ b/bin/tests/system/pending/prereq.sh @@ -14,15 +14,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3 2009/11/18 23:48:06 tbox Exp $ - -../../../tools/genrandom 400 random.data - -if $KEYGEN -q -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1 -then - rm -f Kfoo* -else - echo "I:This test requires cryptography" >&2 - echo "I:--with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 - exit 1 -fi +exec sh ../testcrypto.sh diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh index aa44c0605b..6d6df6c286 100644 --- a/bin/tests/system/pending/setup.sh +++ b/bin/tests/system/pending/setup.sh @@ -14,8 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2 2009/11/17 23:55:18 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh -e sign.sh diff --git a/bin/tests/system/pkcs11/clean.sh b/bin/tests/system/pkcs11/clean.sh index a0cae316d6..24915e8559 100644 --- a/bin/tests/system/pkcs11/clean.sh +++ b/bin/tests/system/pkcs11/clean.sh @@ -14,9 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl -rm -f dig.out random.data pin +rm -f dig.out pin rm -f ns1/*.key ns1/named.memstats rm -f supported diff --git a/bin/tests/system/pkcs11/prereq.sh b/bin/tests/system/pkcs11/prereq.sh index 9d93c16a59..7aebf1cf21 100644 --- a/bin/tests/system/pkcs11/prereq.sh +++ b/bin/tests/system/pkcs11/prereq.sh @@ -14,19 +14,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $ - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data - +echo "I:(Native PKCS#11)" >&2 rsafail=0 eccfail=0 -$KEYGEN -q -r random.data foo > /dev/null 2>&1 || rsafail=1 -rm -f Kfoo* - -$KEYGEN -q -a ECDSAP256SHA256 -r random.data foo > /dev/null 2>&1 || eccfail=1 -rm -f Kfoo* +sh ../testcrypto.sh -q rsa || rsafail=1 +sh ../testcrypto.sh -q ecdsa || eccfail=1 if [ $rsafail = 0 -a $eccfail = 0 ]; then echo both > supported diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh index 215d6a60f5..ceebff50d4 100644 --- a/bin/tests/system/pkcs11/setup.sh +++ b/bin/tests/system/pkcs11/setup.sh @@ -17,7 +17,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=random.data infile=ns1/example.db.in /bin/echo -n ${HSMPIN:-1234}> pin diff --git a/bin/tests/system/pkcs11/tests.sh b/bin/tests/system/pkcs11/tests.sh index 4599217a44..047c79b8b4 100644 --- a/bin/tests/system/pkcs11/tests.sh +++ b/bin/tests/system/pkcs11/tests.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=random.data - DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p 5300" status=0 diff --git a/bin/tests/system/pkcs11ssl/clean.sh b/bin/tests/system/pkcs11ssl/clean.sh index 39c23cc2cd..54a46be736 100644 --- a/bin/tests/system/pkcs11ssl/clean.sh +++ b/bin/tests/system/pkcs11ssl/clean.sh @@ -15,6 +15,6 @@ # PERFORMANCE OF THIS SOFTWARE. rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl -rm -f dig.out random.data pin +rm -f dig.out pin rm -f ns1/*.key ns1/named.memstats rm -f supported diff --git a/bin/tests/system/pkcs11ssl/prereq.sh b/bin/tests/system/pkcs11ssl/prereq.sh index d1c6dde86d..54ed812438 100644 --- a/bin/tests/system/pkcs11ssl/prereq.sh +++ b/bin/tests/system/pkcs11ssl/prereq.sh @@ -14,21 +14,5 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $ - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data - -echo rsaonly > supported -exit 0 - -rsafail=0 eccfail=0 - -$KEYGEN -q -r random.data foo > /dev/null 2>&1 || rsafail=1 -rm -f Kfoo* - -if [ $rsafail = 1 ]; then - echo "I:This test requires OpenSSL built with PKCS#11 support." >&2 - exit 255 -fi +echo "I:(PKCS#11 via OpenSSL)" >&2 +exec sh ../testcrypto.sh rsa diff --git a/bin/tests/system/pkcs11ssl/setup.sh b/bin/tests/system/pkcs11ssl/setup.sh index afc879667c..7046d46481 100644 --- a/bin/tests/system/pkcs11ssl/setup.sh +++ b/bin/tests/system/pkcs11ssl/setup.sh @@ -17,7 +17,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=random.data infile=ns1/example.db.in /bin/echo -n ${HSMPIN:-1234}> pin diff --git a/bin/tests/system/pkcs11ssl/tests.sh b/bin/tests/system/pkcs11ssl/tests.sh index d82c113b88..c22dc4fe1a 100644 --- a/bin/tests/system/pkcs11ssl/tests.sh +++ b/bin/tests/system/pkcs11ssl/tests.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=random.data - DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p 5300" status=0 diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh index d9648bd45b..14be6c5c7b 100644 --- a/bin/tests/system/redirect/clean.sh +++ b/bin/tests/system/redirect/clean.sh @@ -14,9 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $ - - rm -f ns1/K* rm -f ns1/signed.db* rm -f ns1/nsec3.db* @@ -24,6 +21,6 @@ rm -f ns1/dsset-signed. rm -f ns1/dsset-nsec3. rm -f */named.memstats rm -f */named.run -rm -f dig.out.* random.data +rm -f dig.out.* rm -f ns2/*.db rm -f rndc.out diff --git a/bin/tests/system/redirect/ns1/sign.sh b/bin/tests/system/redirect/ns1/sign.sh index 95fe7304a0..fcfc492b87 100644 --- a/bin/tests/system/redirect/ns1/sign.sh +++ b/bin/tests/system/redirect/ns1/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=signed infile=example.db zonefile=signed.db diff --git a/bin/tests/system/redirect/prereq.sh b/bin/tests/system/redirect/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/redirect/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh index 94512ec6d8..71efcbe9b4 100644 --- a/bin/tests/system/redirect/setup.sh +++ b/bin/tests/system/redirect/setup.sh @@ -16,9 +16,11 @@ # $Id: setup.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $ +SYSTEMTESTTOP=.. + sh clean.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cp ns2/redirect.db.in ns2/redirect.db cp ns2/example.db.in ns2/example.db diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh index 1ad1572043..a721e3f0e5 100644 --- a/bin/tests/system/resolver/clean.sh +++ b/bin/tests/system/resolver/clean.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.11 2012/02/22 00:37:54 each Exp $ - # # Clean up after resolver tests. # @@ -32,5 +30,4 @@ rm -f ns6/example.net.db.signed ns6/example.net.db rm -f ns6/dsset-example.net. ns6/example.net.db.signed.jnl rm -f ns6/to-be-removed.tld.db ns6/to-be-removed.tld.db.jnl rm -f ns7/server.db ns7/server.db.jnl ns7/named.conf -rm -f random.data rm -f resolve.out diff --git a/bin/tests/system/resolver/ns6/keygen.sh b/bin/tests/system/resolver/ns6/keygen.sh index fed820b85b..366f44a4ec 100644 --- a/bin/tests/system/resolver/ns6/keygen.sh +++ b/bin/tests/system/resolver/ns6/keygen.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=example.net zonefile="${zone}.db" infile="${zonefile}.in" diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh index 1070f85e90..52d1d7d7fc 100644 --- a/bin/tests/system/resolver/prereq.sh +++ b/bin/tests/system/resolver/prereq.sh @@ -15,8 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.7 2007/06/19 23:47:05 tbox Exp $ - if $PERL -e 'use Net::DNS;' 2>/dev/null then : @@ -24,3 +22,5 @@ else echo "I:This test requires the Net::DNS library." >&2 exit 1 fi + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh index cbb918b27c..92b54a14d5 100644 --- a/bin/tests/system/resolver/setup.sh +++ b/bin/tests/system/resolver/setup.sh @@ -14,9 +14,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.7 2012/02/09 23:47:17 tbox Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cp ns4/tld1.db ns4/tld.db cp ns6/to-be-removed.tld.db.in ns6/to-be-removed.tld.db diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh index 326e31c568..62b26a7d04 100644 --- a/bin/tests/system/rndc/clean.sh +++ b/bin/tests/system/rndc/clean.sh @@ -14,13 +14,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.2 2011/03/21 18:06:06 each Exp $ - rm -f ns2/nil.db ns2/other.db ns2/static.db ns2/*.jnl rm -f ns2/session.key rm -f ns2/named.stats rm -f ns3/named_dump.db rm -f ns*/named.memstats rm -f ns*/named.run -rm -f random.data rm -f ns4/*.conf diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh index a3df13d262..62fbaed4c3 100644 --- a/bin/tests/system/rndc/setup.sh +++ b/bin/tests/system/rndc/setup.sh @@ -21,7 +21,7 @@ SYSTEMTESTTOP=.. sh clean.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE sh ../genzone.sh 2 >ns2/nil.db sh ../genzone.sh 2 >ns2/other.db @@ -30,7 +30,7 @@ sh ../genzone.sh 2 >ns2/static.db cat ns4/named.conf.in > ns4/named.conf make_key () { - $RNDCCONFGEN -r random.data -k key$1 -A $2 -s 10.53.0.4 -p 995${1} \ + $RNDCCONFGEN -r $RANDFILE -k key$1 -A $2 -s 10.53.0.4 -p 995${1} \ > ns4/key${1}.conf egrep -v '(^# Start|^# End|^# Use|^[^#])' ns4/key$1.conf | cut -c3- | \ sed 's/allow { 10.53.0.4/allow { any/' >> ns4/named.conf diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh index ed10bcda8d..5837e988eb 100644 --- a/bin/tests/system/rpz/clean.sh +++ b/bin/tests/system/rpz/clean.sh @@ -12,13 +12,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - - - # Clean up after rpz tests. -rm -f proto.* dsset-* random.data trusted.conf dig.out* nsupdate.tmp ns*/*tmp +rm -f proto.* dsset-* trusted.conf dig.out* nsupdate.tmp ns*/*tmp rm -f ns*/*.key ns*/*.private ns2/tld2s.db ns2/bl.tld2.db rm -f ns3/bl*.db ns*/*switch ns5/requests ns5/example.db ns5/bl.db ns5/*.perf rm -f */named.memstats */named.run */named.stats */session.key diff --git a/bin/tests/system/rpz/prereq.sh b/bin/tests/system/rpz/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/rpz/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh index b459a4a205..5231a2192f 100644 --- a/bin/tests/system/rpz/setup.sh +++ b/bin/tests/system/rpz/setup.sh @@ -37,11 +37,11 @@ for NM in '' -2 -given -disabled -passthru -no-op -nodata -nxdomain -cname -wild done # sign the root and a zone in ns2 -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE # $1=directory, $2=domain name, $3=input zone file, $4=output file signzone () { - KEYNAME=`$KEYGEN -q -r random.data -b 512 -K $1 $2` + KEYNAME=`$KEYGEN -q -r $RANDFILE -b 512 -K $1 $2` cat $1/$3 $1/$KEYNAME.key > $1/tmp $SIGNER -Pp -K $1 -o $2 -f $1/$4 $1/tmp >/dev/null sed -n -e 's/\(.*\) IN DNSKEY \([0-9]\{1,\} [0-9]\{1,\} [0-9]\{1,\}\) \(.*\)/trusted-keys {"\1" \2 "\3";};/p' $1/$KEYNAME.key >>trusted.conf diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index cf1ee43343..e4a463f9e3 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -188,8 +188,9 @@ main(int argc, char **argv) { CHECK(isc_mem_create(0, 0, &mctx), "isc_mem_create()"); CHECK(isc_entropy_create(mctx, &ectx), "isc_entropy_create()"); CHECK(isc_entropy_usebestsource(ectx, &source, - "random.data", ISC_ENTROPY_KEYBOARDNO), - "isc_entropy_usebestsource(\"random.data\")"); + "../random.data", + ISC_ENTROPY_KEYBOARDNO), + "isc_entropy_usebestsource(\"../random.data\")"); CHECK(dst_lib_init2(mctx, ectx, NULL, 0), "dst_lib_init2()"); CHECK(isc_log_create(mctx, &log_, &logconfig), "isc_log_create()"); isc_log_setcontext(log_); diff --git a/bin/tests/system/rsabigexponent/clean.sh b/bin/tests/system/rsabigexponent/clean.sh index 0d84f75563..c2466c9d6c 100644 --- a/bin/tests/system/rsabigexponent/clean.sh +++ b/bin/tests/system/rsabigexponent/clean.sh @@ -14,10 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - rm -f K* */K* */dsset-*. */*.signed */trusted.conf */tmp* -rm -f random.data rm -f ns*/named.run rm -f ns*/named.memstats rm -f ns1/root.db diff --git a/bin/tests/system/rsabigexponent/ns1/sign.sh b/bin/tests/system/rsabigexponent/ns1/sign.sh index 7e0854f18e..d481b45a2f 100755 --- a/bin/tests/system/rsabigexponent/ns1/sign.sh +++ b/bin/tests/system/rsabigexponent/ns1/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/rsabigexponent/ns2/sign.sh b/bin/tests/system/rsabigexponent/ns2/sign.sh index e177b93f3c..968ab498ac 100755 --- a/bin/tests/system/rsabigexponent/ns2/sign.sh +++ b/bin/tests/system/rsabigexponent/ns2/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=example. infile=example.db.in outfile=example.db.bad diff --git a/bin/tests/system/rsabigexponent/prereq.sh b/bin/tests/system/rsabigexponent/prereq.sh index 99767a2d14..d7c6875714 100644 --- a/bin/tests/system/rsabigexponent/prereq.sh +++ b/bin/tests/system/rsabigexponent/prereq.sh @@ -14,15 +14,16 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE if ./bigkey > /dev/null 2>&1 then rm -f Kexample.* else echo "I:This test requires cryptography" >&2 - echo "I:--with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 + echo "I:configure with --with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 exit 1 fi diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh index bf24be6c51..72ebe14469 100644 --- a/bin/tests/system/rsabigexponent/setup.sh +++ b/bin/tests/system/rsabigexponent/setup.sh @@ -14,10 +14,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - sh clean.sh -../../../tools/genrandom 400 random.data +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh -e sign.sh diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh index cd0cf85a0f..c388f8ae79 100644 --- a/bin/tests/system/run.sh +++ b/bin/tests/system/run.sh @@ -116,6 +116,7 @@ else echo "R:PASS" # Clean up. + rm -f $SYSTEMTESTTOP/random.data if test -f $test/clean.sh then ( cd $test && sh clean.sh "$@" ) diff --git a/bin/tests/system/smartsign/clean.sh b/bin/tests/system/smartsign/clean.sh index 407a6eb034..a2766d2e00 100644 --- a/bin/tests/system/smartsign/clean.sh +++ b/bin/tests/system/smartsign/clean.sh @@ -14,6 +14,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.3 2010/01/18 23:48:40 tbox Exp $ - -rm -f K* dsset-* *.signed random.data dnskey.sigs other.sigs dsset.out +rm -f K* dsset-* *.signed dnskey.sigs other.sigs dsset.out diff --git a/bin/tests/system/smartsign/prereq.sh b/bin/tests/system/smartsign/prereq.sh index 1b28e59746..b9de2594b4 100644 --- a/bin/tests/system/smartsign/prereq.sh +++ b/bin/tests/system/smartsign/prereq.sh @@ -14,15 +14,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3 2010/01/18 23:48:40 tbox Exp $ - -../../../tools/genrandom 400 random.data - -if $KEYGEN -q -r random.data foo > /dev/null 2>&1 -then - rm -f Kfoo* -else - echo "I:This test requires cryptography" >&2 - echo "I:--with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 - exit 1 -fi +exec sh ../testcrypto.sh diff --git a/bin/tests/system/smartsign/setup.sh b/bin/tests/system/smartsign/setup.sh index a25d371600..37c3656f31 100644 --- a/bin/tests/system/smartsign/setup.sh +++ b/bin/tests/system/smartsign/setup.sh @@ -14,7 +14,8 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.3 2010/01/18 23:48:40 tbox Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh sh clean.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh index e0e2244d4a..6b995ea5cb 100644 --- a/bin/tests/system/smartsign/tests.sh +++ b/bin/tests/system/smartsign/tests.sh @@ -21,8 +21,6 @@ SYSTEMTESTTOP=.. status=0 -RANDFILE=./random.data - pzone=parent.nil pfile=parent.db diff --git a/bin/tests/system/staticstub/clean.sh b/bin/tests/system/staticstub/clean.sh index 8490c6767f..4992aeb887 100755 --- a/bin/tests/system/staticstub/clean.sh +++ b/bin/tests/system/staticstub/clean.sh @@ -14,12 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.3 2010/12/17 00:57:38 marka Exp $ - rm -rf */*.signed rm -rf */K* rm -rf */dsset-* -rm -rf random.data rm -rf */trusted.conf rm -f ns?/named.run rm -f ns?/named.memstats diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh index f5b16c6e9b..2aea1a45cd 100755 --- a/bin/tests/system/staticstub/ns3/sign.sh +++ b/bin/tests/system/staticstub/ns3/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=example. infile=example.db.in zonefile=example.db diff --git a/bin/tests/system/staticstub/ns4/sign.sh b/bin/tests/system/staticstub/ns4/sign.sh index 464d917d44..f85e5f5770 100755 --- a/bin/tests/system/staticstub/ns4/sign.sh +++ b/bin/tests/system/staticstub/ns4/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=sub.example infile=${zone}.db.in zonefile=${zone}.db diff --git a/bin/tests/system/staticstub/prereq.sh b/bin/tests/system/staticstub/prereq.sh new file mode 100755 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/staticstub/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh index 4c5a55cd25..4c40b87ddd 100755 --- a/bin/tests/system/staticstub/setup.sh +++ b/bin/tests/system/staticstub/setup.sh @@ -14,12 +14,13 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.3 2010/12/17 00:57:38 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' ns2/named.conf.in > ns2/named.conf sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' ns3/named.conf.in > ns3/named.conf -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns3 && sh -e sign.sh diff --git a/bin/tests/system/statistics/prereq.sh b/bin/tests/system/statistics/prereq.sh index ec2be34417..b7566ac4b3 100644 --- a/bin/tests/system/statistics/prereq.sh +++ b/bin/tests/system/statistics/prereq.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.2 2011/03/12 23:47:42 tbox Exp $ - if $PERL -e 'use Net::DNS;' 2>/dev/null then : diff --git a/bin/tests/system/testcrypto.sh b/bin/tests/system/testcrypto.sh new file mode 100644 index 0000000000..c86966f9af --- /dev/null +++ b/bin/tests/system/testcrypto.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +SYSTEMTESTTOP=${SYSTEMTESTTOP:=..} +. $SYSTEMTESTTOP/conf.sh + +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE + +prog=$0 + +args="-r $RANDFILE" +alg="-a RSAMD5 -b 512" +quiet=0 + +msg1="cryptography" +msg2="--with-openssl, or --enable-native-pkcs11 --with-pkcs11" +while test "$#" -gt 0; do + case $1 in + -q) + args="$args -q" + quiet=1 + ;; + rsa|RSA) + alg="" + msg1="RSA cryptography" + ;; + gost|GOST) + alg="-a eccgost" + msg1="GOST cryptography" + msg2="--with-gost" + ;; + ecdsa|ECDSA) + alg="-a ecdsap256sha256" + msg1="ECDSA cryptography" + msg2="--with-ecdsa" + ;; + *) + echo "${prog}: unknown argument" + exit 1 + ;; + esac + shift +done + + +if $KEYGEN $args $alg foo > /dev/null 2>&1 +then + rm -f Kfoo* +else + if test $quiet -eq 0; then + echo "I:This test requires support for $msg1" >&2 + echo "I:configure with $msg2" >&2 + fi + exit 255 +fi diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh index 649401d90d..b1d017c910 100644 --- a/bin/tests/system/tkey/clean.sh +++ b/bin/tests/system/tkey/clean.sh @@ -15,9 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.8 2011/11/03 23:46:26 tbox Exp $ - -rm -f dig.out.* rndc.out.* random.data ns1/named.conf +rm -f dig.out.* rndc.out.* ns1/named.conf rm -f K* ns1/K* rm -f */named.memstats rm -f ns1/_default.tsigkeys diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c index 9010b43cf5..bd0a5fee41 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -233,7 +233,7 @@ main(int argc, char *argv[]) { ectx = NULL; RUNCHECK(isc_entropy_create(mctx, &ectx)); - RUNCHECK(isc_entropy_createfilesource(ectx, "random.data")); + RUNCHECK(isc_entropy_createfilesource(ectx, "../random.data")); RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); log = NULL; diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c index 1bb33e85fe..304b89c308 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -173,7 +173,7 @@ main(int argc, char **argv) { ectx = NULL; RUNCHECK(isc_entropy_create(mctx, &ectx)); - RUNCHECK(isc_entropy_createfilesource(ectx, "random.data")); + RUNCHECK(isc_entropy_createfilesource(ectx, "../random.data")); RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); log = NULL; diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in index 087d8df528..2242b5874d 100644 --- a/bin/tests/system/tkey/ns1/named.conf.in +++ b/bin/tests/system/tkey/ns1/named.conf.in @@ -32,6 +32,7 @@ options { tkey-domain "server"; tkey-dhkey "server" KEYID; allow-query-cache { any; }; + random-device "RANDFILE"; }; key rndc_key { diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh index 7a6e7501ee..45d1897077 100644 --- a/bin/tests/system/tkey/ns1/setup.sh +++ b/bin/tests/system/tkey/ns1/setup.sh @@ -15,11 +15,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.10 2009/07/19 23:47:55 tbox Exp $ - -RANDFILE=../random.data +SYSTEMTESTTOP=../.. +. $SYSTEMTESTTOP/conf.sh keyname=`$KEYGEN -T KEY -a DH -b 768 -n host -r $RANDFILE server` keyid=`echo $keyname | $PERL -p -e 's/^.*\+0*//;'` rm -f named.conf -perl -p -e "s/KEYID/$keyid/;" < named.conf.in > named.conf +sed -e "s;KEYID;$keyid;" -e "s;RANDFILE;$RANDFILE;" < named.conf.in > named.conf diff --git a/bin/tests/system/tkey/prereq.sh b/bin/tests/system/tkey/prereq.sh index 06d3a1e00b..0a5f897b6a 100644 --- a/bin/tests/system/tkey/prereq.sh +++ b/bin/tests/system/tkey/prereq.sh @@ -15,15 +15,4 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.12 2009/03/02 23:47:43 tbox Exp $ - -../../../tools/genrandom 400 random.data - -if $KEYGEN -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1 -then - rm -f foo* -else - echo "I:This test requires cryptography" >&2 - echo "I:--with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 - exit 1 -fi +exec sh ../testcrypto.sh diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh index 302ad823ea..5f273e93ae 100644 --- a/bin/tests/system/tkey/setup.sh +++ b/bin/tests/system/tkey/setup.sh @@ -15,12 +15,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.7 2009/03/02 23:47:43 tbox Exp $ - -RANDFILE=random.data +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh sh clean.sh -../../../tools/genrandom 100 $RANDFILE +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE cd ns1 && sh setup.sh diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh index f60fe7a2f4..420e77f9c3 100644 --- a/bin/tests/system/tkey/tests.sh +++ b/bin/tests/system/tkey/tests.sh @@ -24,8 +24,6 @@ DIGOPTS="@10.53.0.1 -p 5300" status=0 -RANDFILE=random.data - echo "I:generating new DH key" ret=0 dhkeyname=`$KEYGEN -T KEY -a DH -b 768 -n host -r $RANDFILE client` || ret=1 diff --git a/bin/tests/system/tsiggss/clean.sh b/bin/tests/system/tsiggss/clean.sh index e67d0b9cc1..eeb9aab5e5 100644 --- a/bin/tests/system/tsiggss/clean.sh +++ b/bin/tests/system/tsiggss/clean.sh @@ -8,5 +8,4 @@ rm -f ns1/*.db ns1/K*.key ns1/K*.private rm -f ns1/_default.tsigkeys rm -f */named.memstats rm -f authsock.pid -rm -f random.data rm -f ns1/core diff --git a/bin/tests/system/tsiggss/prereq.sh b/bin/tests/system/tsiggss/prereq.sh index c2d3278c89..a824dfe702 100644 --- a/bin/tests/system/tsiggss/prereq.sh +++ b/bin/tests/system/tsiggss/prereq.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010-2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010-2012, 2014 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -14,14 +14,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.6 2011/04/05 16:10:39 smann Exp $ - -TOP=${SYSTEMTESTTOP:=.}/../../../.. - # enable the tsiggss test only if gssapi was enabled ./gssapi_krb || { echo "I:gssapi and krb5 not supported - skipping tsiggss test" exit 255 } -exit 0 +# ... and crypto +exec sh ../testcrypto.sh diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh index 00222bad05..2853e89c84 100644 --- a/bin/tests/system/tsiggss/setup.sh +++ b/bin/tests/system/tsiggss/setup.sh @@ -19,12 +19,9 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -RANDFILE="random.data" - +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE rm -f ns1/*.jnl ns1/K*.key ns1/K*.private ns1/_default.tsigkeys -../../../tools/genrandom 400 $RANDFILE - key=`$KEYGEN -Cq -K ns1 -a DSA -b 512 -r $RANDFILE -n HOST -T KEY key.example.nil.` cat ns1/example.nil.db.in ns1/${key}.key > ns1/example.nil.db diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh index 005d0af150..a8220633e0 100644 --- a/bin/tests/system/tsiggss/tests.sh +++ b/bin/tests/system/tsiggss/tests.sh @@ -62,7 +62,7 @@ test_update testcname.example.nil. TXT "86400 A 10.53.0.13" "10.53.0.13" && stat echo "I:testing external policy with SIG(0) key" ret=0 -$NSUPDATE -R random.data -k ns1/Kkey.example.nil.*.private < /dev/null 2>&1 || ret=1 +$NSUPDATE -R $RANDFILE -k ns1/Kkey.example.nil.*.private < /dev/null 2>&1 || ret=1 server 10.53.0.1 5300 zone example.nil update add fred.example.nil 120 cname foo.bar. diff --git a/bin/tests/system/unknown/ns3/sign.sh b/bin/tests/system/unknown/ns3/sign.sh index 6a0135e989..7fd84f28ba 100644 --- a/bin/tests/system/unknown/ns3/sign.sh +++ b/bin/tests/system/unknown/ns3/sign.sh @@ -19,8 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - zone=example rm -f K${zone}.+*+*.key rm -f K${zone}.+*+*.private diff --git a/bin/tests/system/unknown/prereq.sh b/bin/tests/system/unknown/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/unknown/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh index 921e6ed520..d0064e9d76 100644 --- a/bin/tests/system/unknown/setup.sh +++ b/bin/tests/system/unknown/setup.sh @@ -12,10 +12,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.11 2012/02/23 06:53:15 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -sh clean.sh - -../../../tools/genrandom 400 random.data +sh clean.sh +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE (cd ns3; sh -e sign.sh) diff --git a/bin/tests/system/upforwd/prereq.sh b/bin/tests/system/upforwd/prereq.sh index 4774d4e3b1..b7566ac4b3 100644 --- a/bin/tests/system/upforwd/prereq.sh +++ b/bin/tests/system/upforwd/prereq.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3 2012/01/23 23:46:48 tbox Exp $ - if $PERL -e 'use Net::DNS;' 2>/dev/null then : diff --git a/bin/tests/system/verify/clean.sh b/bin/tests/system/verify/clean.sh index 509fc65091..f58be5b0fb 100644 --- a/bin/tests/system/verify/clean.sh +++ b/bin/tests/system/verify/clean.sh @@ -12,8 +12,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - rm -f zones/*.good rm -f zones/*.good.tmp rm -f zones/*.bad @@ -21,5 +19,4 @@ rm -f zones/*.bad.tmp rm -f zones/*.out* rm -f zones/dsset-* rm -f zones/K* -rm -f random.data rm -f verify.out* diff --git a/bin/tests/system/verify/prereq.sh b/bin/tests/system/verify/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/verify/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/verify/setup.sh b/bin/tests/system/verify/setup.sh index 4d65286173..fddc89b8e3 100644 --- a/bin/tests/system/verify/setup.sh +++ b/bin/tests/system/verify/setup.sh @@ -14,10 +14,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.20 2011/02/15 22:02:36 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh sh clean.sh - -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE (cd zones && sh genzones.sh) diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh index 59622b0837..a89dc40f21 100644 --- a/bin/tests/system/verify/zones/genzones.sh +++ b/bin/tests/system/verify/zones/genzones.sh @@ -17,8 +17,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data - dumpit () { echo "D:${debug}: dumping ${1}" cat "${1}" | sed 's/^/D:/' diff --git a/bin/tests/system/wildcard/clean.sh b/bin/tests/system/wildcard/clean.sh index 03b96a8f61..7343237bf0 100644 --- a/bin/tests/system/wildcard/clean.sh +++ b/bin/tests/system/wildcard/clean.sh @@ -14,9 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.1.2.1 2010/06/01 03:55:01 marka Exp $ - -rm -f random.data rm -f ns*/named.run rm -f ns1/K* rm -f ns1/*.db diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh index 1ad5207ae9..29db82718e 100755 --- a/bin/tests/system/wildcard/ns1/sign.sh +++ b/bin/tests/system/wildcard/ns1/sign.sh @@ -19,7 +19,6 @@ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh -RANDFILE=../random.data dssets= zone=dlv. diff --git a/bin/tests/system/wildcard/prereq.sh b/bin/tests/system/wildcard/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/wildcard/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh index fb4816df46..67f1295c63 100644 --- a/bin/tests/system/wildcard/setup.sh +++ b/bin/tests/system/wildcard/setup.sh @@ -14,8 +14,9 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.1.2.1 2010/06/01 03:55:01 marka Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh -../../../tools/genrandom 400 random.data +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE (cd ns1 && sh -e sign.sh) diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh index 81aede3921..b68cc58e6d 100644 --- a/bin/tests/system/xfer/prereq.sh +++ b/bin/tests/system/xfer/prereq.sh @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - if $PERL -e 'use Net::DNS;' 2>/dev/null then if $PERL -e 'use Net::DNS; die if $Net::DNS::VERSION == 0.73;' 2>/dev/null diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh index 3ea48c648a..334db52268 100644 --- a/bin/tests/system/zonechecks/clean.sh +++ b/bin/tests/system/zonechecks/clean.sh @@ -14,10 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.8 2012/01/31 23:47:32 tbox Exp $ - rm -f *.out rm -f */named.memstats rm -f */*.db */*.db.signed */K*.key */K*.private */*.jnl */dsset-* rm -f rndc.out.* -rm -f random.data diff --git a/bin/tests/system/zonechecks/prereq.sh b/bin/tests/system/zonechecks/prereq.sh new file mode 100644 index 0000000000..d90b9b2725 --- /dev/null +++ b/bin/tests/system/zonechecks/prereq.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +exec sh ../testcrypto.sh diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh index aaea60c5bc..286898c28b 100644 --- a/bin/tests/system/zonechecks/setup.sh +++ b/bin/tests/system/zonechecks/setup.sh @@ -14,17 +14,18 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.3 2012/01/31 23:47:32 tbox Exp $ +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh sh clean.sh +test -e $RANDFILE || $GENRANDOM 400 $RANDFILE -../../../tools/genrandom 400 random.data sh ../genzone.sh 1 > ns1/master.db cd ns1 touch master.db.signed echo '$INCLUDE "master.db.signed"' >> master.db -$KEYGEN -r ../random.data -3q master.example > /dev/null 2>&1 -$KEYGEN -r ../random.data -3qfk master.example > /dev/null 2>&1 +$KEYGEN -r $RANDFILE -3q master.example > /dev/null 2>&1 +$KEYGEN -r $RANDFILE -3qfk master.example > /dev/null 2>&1 $SIGNER -SD -o master.example master.db > /dev/null 2>&1 echo '$INCLUDE "soa.db"' > reload.db echo '@ 0 NS .' >> reload.db diff --git a/configure b/configure index e34f59d701..b384148809 100755 --- a/configure +++ b/configure @@ -21263,7 +21263,7 @@ ac_config_commands="$ac_config_commands chmod" # elsewhere if there's a good reason for doing so. # -ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dsdigest/prereq.sh bin/tests/system/ecdsa/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/gost/prereq.sh bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/check-secure-delegation.pl contrib/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/iscpk11/Makefile lib/iscpk11/include/Makefile lib/iscpk11/include/iscpk11/Makefile lib/iscpk11/include/pkcs11/Makefile lib/iscpk11/unix/Makefile lib/iscpk11/unix/include/Makefile lib/iscpk11/unix/include/pkcs11/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" +ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dlzredir/prereq.sh bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/check-secure-delegation.pl contrib/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/iscpk11/Makefile lib/iscpk11/include/Makefile lib/iscpk11/include/iscpk11/Makefile lib/iscpk11/include/pkcs11/Makefile lib/iscpk11/unix/Makefile lib/iscpk11/unix/include/Makefile lib/iscpk11/unix/include/pkcs11/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" # @@ -22308,12 +22308,9 @@ do "bin/tests/system/dlz/prereq.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dlz/prereq.sh" ;; "bin/tests/system/dlzexternal/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dlzexternal/Makefile" ;; "bin/tests/system/dlzexternal/ns1/named.conf") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dlzexternal/ns1/named.conf" ;; - "bin/tests/system/dsdigest/prereq.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dsdigest/prereq.sh" ;; - "bin/tests/system/ecdsa/prereq.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/ecdsa/prereq.sh" ;; "bin/tests/system/dlzredir/prereq.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dlzredir/prereq.sh" ;; "bin/tests/system/filter-aaaa/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/filter-aaaa/Makefile" ;; "bin/tests/system/geoip/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/geoip/Makefile" ;; - "bin/tests/system/gost/prereq.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/gost/prereq.sh" ;; "bin/tests/system/inline/checkdsa.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/inline/checkdsa.sh" ;; "bin/tests/system/lwresd/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/lwresd/Makefile" ;; "bin/tests/system/rpz/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/rpz/Makefile" ;; diff --git a/configure.in b/configure.in index c92ad47c9b..6b8443ad51 100644 --- a/configure.in +++ b/configure.in @@ -4016,12 +4016,9 @@ AC_CONFIG_FILES([ bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf - bin/tests/system/dsdigest/prereq.sh - bin/tests/system/ecdsa/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile - bin/tests/system/gost/prereq.sh bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rpz/Makefile diff --git a/lib/dns/tests/gost_test.c b/lib/dns/tests/gost_test.c index 68283d0963..79caf8c3f0 100644 --- a/lib/dns/tests/gost_test.c +++ b/lib/dns/tests/gost_test.c @@ -368,7 +368,7 @@ ATF_TC_HEAD(untested, tc) { } ATF_TC_BODY(untested, tc) { UNUSED(tc); - atf_tc_skip("GOST hash not available"); + atf_tc_skip("GOST not available"); } #endif /* diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c index 99e222c740..dec0dc2e54 100644 --- a/lib/dns/tests/nsec3_test.c +++ b/lib/dns/tests/nsec3_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2012, 2014 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -29,6 +29,7 @@ #include "dnstest.h" +#if defined(OPENSSL) || defined(PKCS11CRYPTO) /* * Helper functions */ @@ -74,12 +75,26 @@ ATF_TC_BODY(max_iterations, tc) { iteration_test("testdata/nsec3/min-1024.db", 150); iteration_test("testdata/nsec3/min-2048.db", 500); } +#else +ATF_TC(untested); +ATF_TC_HEAD(untested, tc) { + atf_tc_set_md_var(tc, "descr", "skipping nsec3 test"); +} +ATF_TC_BODY(untested, tc) { + UNUSED(tc); + atf_tc_skip("DNSSEC not available"); +} +#endif /* * Main */ ATF_TP_ADD_TCS(tp) { +#if defined(OPENSSL) || defined(PKCS11CRYPTO) ATF_TP_ADD_TC(tp, max_iterations); +#else + ATF_TP_ADD_TC(tp, untested); +#endif return (atf_no_error()); } diff --git a/util/copyrights b/util/copyrights index db20db722a..2f7930bed7 100644 --- a/util/copyrights +++ b/util/copyrights @@ -936,6 +936,7 @@ ./bin/tests/system/coverage/08-zsk-ttl/README X 2013 ./bin/tests/system/coverage/08-zsk-ttl/expect X 2013 ./bin/tests/system/coverage/clean.sh SH 2013 +./bin/tests/system/coverage/prereq.sh SH 2014 ./bin/tests/system/coverage/setup.sh SH 2013,2014 ./bin/tests/system/coverage/tests.sh SH 2013,2014 ./bin/tests/system/database/clean.sh SH 2011,2012 @@ -978,6 +979,7 @@ ./bin/tests/system/dlv/ns6/hints ZONE 2010 ./bin/tests/system/dlv/ns6/named.conf CONF-C 2010,2011 ./bin/tests/system/dlv/ns6/sign.sh SH 2010,2011,2012 +./bin/tests/system/dlv/prereq.sh SH 2014 ./bin/tests/system/dlv/setup.sh SH 2004,2007,2009,2011,2012 ./bin/tests/system/dlv/tests.sh SH 2004,2007,2010,2011,2012 ./bin/tests/system/dlvauto/clean.sh SH 2011,2012 @@ -986,6 +988,7 @@ ./bin/tests/system/dlvauto/ns1/root.db.in ZONE 2011 ./bin/tests/system/dlvauto/ns1/sign.sh SH 2011,2012 ./bin/tests/system/dlvauto/ns2/named.conf CONF-C 2011,2013 +./bin/tests/system/dlvauto/prereq.sh SH 2014 ./bin/tests/system/dlvauto/setup.sh SH 2011,2012 ./bin/tests/system/dlvauto/tests.sh SH 2011,2012,2014 ./bin/tests/system/dlz/.gitignore X 2012 @@ -998,7 +1001,7 @@ ./bin/tests/system/dlz/prereq.sh.in SH 2011,2012 ./bin/tests/system/dlz/tests.sh SH 2010,2011,2012,2013 ./bin/tests/system/dlzexternal/Makefile.in MAKE 2011,2012 -./bin/tests/system/dlzexternal/clean.sh X 2010,2012 +./bin/tests/system/dlzexternal/clean.sh SH 2010,2012 ./bin/tests/system/dlzexternal/dlopen.c C 2011 ./bin/tests/system/dlzexternal/driver.c C 2011,2012,2013 ./bin/tests/system/dlzexternal/driver.h C 2011 @@ -1006,7 +1009,7 @@ ./bin/tests/system/dlzexternal/ns1/named.conf.in CONF-C 2011,2012,2013 ./bin/tests/system/dlzexternal/prereq.sh SH 2010,2011,2012 ./bin/tests/system/dlzexternal/setup.sh SH 2010,2012 -./bin/tests/system/dlzexternal/tests.sh X 2010,2011,2012,2013 +./bin/tests/system/dlzexternal/tests.sh SH 2010,2011,2012,2013 ./bin/tests/system/dlzredir/.gitignore X 2012 ./bin/tests/system/dlzredir/clean.sh SH 2012 ./bin/tests/system/dlzredir/ns1/dns-root/dns.d/-/A=10=100.100.100.2= X 2012 @@ -1044,6 +1047,7 @@ ./bin/tests/system/dns64/ns1/sign.sh SH 2010,2012 ./bin/tests/system/dns64/ns2/named.conf CONF-C 2010,2011,2013 ./bin/tests/system/dns64/ns2/rpz.db ZONE 2013 +./bin/tests/system/dns64/prereq.sh SH 2014 ./bin/tests/system/dns64/setup.sh SH 2010,2012 ./bin/tests/system/dns64/tests.sh SH 2010,2011,2012,2013 ./bin/tests/system/dnssec/README TXT.BRIEF 2000,2001,2002,2004,2011 @@ -1319,6 +1323,7 @@ ./bin/tests/system/inline/ns5/named.conf.post CONF-C 2011 ./bin/tests/system/inline/ns5/named.conf.pre CONF-C 2011 ./bin/tests/system/inline/ns6/named.conf CONF-C 2011 +./bin/tests/system/inline/prereq.sh SH 2014 ./bin/tests/system/inline/setup.sh SH 2011,2012,2013 ./bin/tests/system/inline/tests.sh SH 2011,2012,2013,2014 ./bin/tests/system/ixfr/ans2/startme X 2011 @@ -1390,6 +1395,7 @@ ./bin/tests/system/masterformat/ns2/formerly-text.db.in ZONE 2011 ./bin/tests/system/masterformat/ns2/named.conf CONF-C 2005,2007,2011,2012 ./bin/tests/system/masterformat/ns3/named.conf CONF-C 2012,2013 +./bin/tests/system/masterformat/prereq.sh SH 2014 ./bin/tests/system/masterformat/setup.sh SH 2005,2006,2007,2011,2012,2013 ./bin/tests/system/masterformat/tests.sh SH 2005,2007,2011,2012,2013 ./bin/tests/system/metadata/child.db ZONE 2009 @@ -1422,6 +1428,7 @@ ./bin/tests/system/nsupdate/ns3/named.conf CONF-C 2010,2011,2013 ./bin/tests/system/nsupdate/ns3/nsec3param.test.db.in ZONE 2010 ./bin/tests/system/nsupdate/ns3/sign.sh SH 2010,2011,2012 +./bin/tests/system/nsupdate/prereq.sh SH 2014 ./bin/tests/system/nsupdate/setup.sh SH 2000,2001,2004,2007,2009,2010,2011,2012 ./bin/tests/system/nsupdate/tests.sh SH 2000,2001,2004,2007,2009,2010,2011,2012,2013 ./bin/tests/system/nsupdate/update_test.pl PERL 2000,2001,2004,2007,2012 @@ -1477,6 +1484,7 @@ ./bin/tests/system/redirect/ns2/example.db.in ZONE 2013 ./bin/tests/system/redirect/ns2/named.conf CONF-C 2011,2013 ./bin/tests/system/redirect/ns2/redirect.db.in ZONE 2011.2013,2013 +./bin/tests/system/redirect/prereq.sh SH 2014 ./bin/tests/system/redirect/setup.sh SH 2011,2012,2013 ./bin/tests/system/redirect/tests.sh SH 2011,2012,2013 ./bin/tests/system/relay/README TXT.BRIEF 2000,2001,2004 @@ -1556,6 +1564,7 @@ ./bin/tests/system/rpz/ns5/named.args X 2013 ./bin/tests/system/rpz/ns5/named.conf CONF-C 2012,2013 ./bin/tests/system/rpz/ns5/tld5.db ZONE 2013 +./bin/tests/system/rpz/prereq.sh SH 2014 ./bin/tests/system/rpz/qperf.sh SH 2012,2013 ./bin/tests/system/rpz/rpz.c C 2011,2012,2013 ./bin/tests/system/rpz/setup.sh SH 2011,2012,2013 @@ -1693,6 +1702,7 @@ ./bin/tests/system/staticstub/ns4/named.conf CONF-C 2010 ./bin/tests/system/staticstub/ns4/sign.sh SH 2010,2012 ./bin/tests/system/staticstub/ns4/sub.example.db.in ZONE 2010 +./bin/tests/system/staticstub/prereq.sh SH 2014 ./bin/tests/system/staticstub/setup.sh SH 2010,2012 ./bin/tests/system/staticstub/tests.sh SH 2010,2011,2012,2013 ./bin/tests/system/statistics/ans4/ans.pl PERL 2012 @@ -1746,16 +1756,16 @@ ./bin/tests/system/tsig/tests.sh SH 2005,2006,2007,2011,2012 ./bin/tests/system/tsiggss/Makefile.in MAKE 2011,2012 ./bin/tests/system/tsiggss/authsock.pl PERL 2011,2012 -./bin/tests/system/tsiggss/clean.sh X 2010,2011 +./bin/tests/system/tsiggss/clean.sh SH 2010,2011 ./bin/tests/system/tsiggss/gssapi_krb.c C 2011 ./bin/tests/system/tsiggss/ns1/administrator.ccache X 2010 ./bin/tests/system/tsiggss/ns1/dns.keytab X 2010 ./bin/tests/system/tsiggss/ns1/example.nil.db.in X 2011 ./bin/tests/system/tsiggss/ns1/named.conf CONF-C 2010,2011,2013 ./bin/tests/system/tsiggss/ns1/testdenied.ccache X 2010 -./bin/tests/system/tsiggss/prereq.sh SH 2010,2011,2012 +./bin/tests/system/tsiggss/prereq.sh SH 2010,2011,2012,2014 ./bin/tests/system/tsiggss/setup.sh SH 2010,2011,2012 -./bin/tests/system/tsiggss/tests.sh X 2010,2011 +./bin/tests/system/tsiggss/tests.sh SH 2010,2011 ./bin/tests/system/unknown/clean.sh SH 2000,2001,2004,2007,2012,2013 ./bin/tests/system/unknown/large.out X 2012 ./bin/tests/system/unknown/ns1/broken1.db ZONE 2000,2001,2004,2007 @@ -1799,6 +1809,7 @@ ./bin/tests/system/v6synth/tests.sh SH 2001,2004,2007,2012 ./bin/tests/system/verify/.gitignore X 2012 ./bin/tests/system/verify/clean.sh SH 2012 +./bin/tests/system/verify/prereq.sh SH 2014 ./bin/tests/system/verify/setup.sh SH 2012 ./bin/tests/system/verify/tests.sh SH 2012,2013 ./bin/tests/system/verify/zones/genzones.sh SH 2012,2013 @@ -1838,6 +1849,7 @@ ./bin/tests/system/wildcard/ns4/named.conf CONF-C 2012 ./bin/tests/system/wildcard/ns5/hints ZONE 2013 ./bin/tests/system/wildcard/ns5/named.conf CONF-C 2013 +./bin/tests/system/wildcard/prereq.sh SH 2014 ./bin/tests/system/wildcard/setup.sh SH 2012 ./bin/tests/system/wildcard/tests.sh SH 2012,2013 ./bin/tests/system/xfer/ans5/badkeydata X 2011 @@ -1889,6 +1901,7 @@ ./bin/tests/system/zonechecks/ns1/named.conf CONF-C 2012,2013 ./bin/tests/system/zonechecks/ns2/named.conf CONF-C 2012,2013 ./bin/tests/system/zonechecks/nxdomain.db ZONE 2004,2007 +./bin/tests/system/zonechecks/prereq.sh SH 2014 ./bin/tests/system/zonechecks/setup.sh SH 2012,2013 ./bin/tests/system/zonechecks/tests.sh SH 2004,2007,2009,2012,2013 ./bin/tests/t_api.pl PERL 1999,2000,2001,2004,2007,2012 @@ -3043,7 +3056,7 @@ ./lib/dns/tests/gost_test.c C 2014 ./lib/dns/tests/master_test.c C 2011,2012,2013 ./lib/dns/tests/mkraw.pl PERL 2011,2012 -./lib/dns/tests/nsec3_test.c C 2012 +./lib/dns/tests/nsec3_test.c C 2012,2014 ./lib/dns/tests/private_test.c C 2011,2012 ./lib/dns/tests/rbt_test.c C 2012,2013,2014 ./lib/dns/tests/rdata_test.c C 2012,2013