]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
[master] testcrypto.sh in system tests
authorEvan Hunt <each@isc.org>
Tue, 21 Jan 2014 00:08:09 +0000 (16:08 -0800)
committerEvan Hunt <each@isc.org>
Tue, 21 Jan 2014 00:08:09 +0000 (16:08 -0800)
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]

154 files changed:
CHANGES
bin/tests/system/Makefile.in
bin/tests/system/autosign/clean.sh
bin/tests/system/autosign/ns1/keygen.sh
bin/tests/system/autosign/ns2/keygen.sh
bin/tests/system/autosign/ns3/keygen.sh
bin/tests/system/autosign/prereq.sh
bin/tests/system/autosign/setup.sh
bin/tests/system/autosign/tests.sh
bin/tests/system/conf.sh.in
bin/tests/system/coverage/clean.sh
bin/tests/system/coverage/prereq.sh [new file with mode: 0644]
bin/tests/system/coverage/setup.sh
bin/tests/system/dlv/clean.sh
bin/tests/system/dlv/ns1/sign.sh
bin/tests/system/dlv/ns2/sign.sh
bin/tests/system/dlv/ns3/sign.sh
bin/tests/system/dlv/ns6/sign.sh
bin/tests/system/dlv/prereq.sh [new file with mode: 0644]
bin/tests/system/dlv/setup.sh
bin/tests/system/dlvauto/clean.sh
bin/tests/system/dlvauto/ns1/sign.sh
bin/tests/system/dlvauto/prereq.sh [new file with mode: 0644]
bin/tests/system/dlvauto/setup.sh
bin/tests/system/dlzexternal/clean.sh
bin/tests/system/dlzexternal/prereq.sh
bin/tests/system/dlzexternal/setup.sh
bin/tests/system/dns64/clean.sh
bin/tests/system/dns64/ns1/sign.sh
bin/tests/system/dns64/prereq.sh [new file with mode: 0644]
bin/tests/system/dns64/setup.sh
bin/tests/system/dnssec/clean.sh
bin/tests/system/dnssec/ns1/sign.sh
bin/tests/system/dnssec/ns2/sign.sh
bin/tests/system/dnssec/ns3/sign.sh
bin/tests/system/dnssec/ns6/sign.sh
bin/tests/system/dnssec/prereq.sh
bin/tests/system/dnssec/setup.sh
bin/tests/system/dnssec/tests.sh
bin/tests/system/dsdigest/clean.sh
bin/tests/system/dsdigest/ns1/sign.sh
bin/tests/system/dsdigest/ns2/sign.sh
bin/tests/system/dsdigest/prereq.sh [moved from bin/tests/system/dsdigest/prereq.sh.in with 85% similarity]
bin/tests/system/dsdigest/setup.sh
bin/tests/system/ecdsa/clean.sh
bin/tests/system/ecdsa/ns1/sign.sh
bin/tests/system/ecdsa/prereq.sh [moved from bin/tests/system/ecdsa/prereq.sh.in with 72% similarity]
bin/tests/system/ecdsa/setup.sh
bin/tests/system/filter-aaaa/clean.sh
bin/tests/system/filter-aaaa/ns1/sign.sh
bin/tests/system/filter-aaaa/ns4/sign.sh
bin/tests/system/filter-aaaa/prereq.sh
bin/tests/system/filter-aaaa/setup.sh
bin/tests/system/gost/clean.sh
bin/tests/system/gost/ns1/sign.sh
bin/tests/system/gost/prereq.sh [moved from bin/tests/system/gost/prereq.sh.in with 70% similarity]
bin/tests/system/gost/setup.sh
bin/tests/system/inline/clean.sh
bin/tests/system/inline/ns1/sign.sh
bin/tests/system/inline/ns3/sign.sh
bin/tests/system/inline/prereq.sh [new file with mode: 0644]
bin/tests/system/inline/setup.sh
bin/tests/system/inline/tests.sh
bin/tests/system/ixfr/prereq.sh
bin/tests/system/masterformat/clean.sh
bin/tests/system/masterformat/ns1/compile.sh
bin/tests/system/masterformat/prereq.sh [new file with mode: 0755]
bin/tests/system/masterformat/setup.sh
bin/tests/system/metadata/clean.sh
bin/tests/system/metadata/prereq.sh
bin/tests/system/metadata/setup.sh
bin/tests/system/metadata/tests.sh
bin/tests/system/nsupdate/clean.sh
bin/tests/system/nsupdate/ns3/sign.sh
bin/tests/system/nsupdate/prereq.sh [new file with mode: 0644]
bin/tests/system/nsupdate/setup.sh
bin/tests/system/nsupdate/tests.sh
bin/tests/system/pending/clean.sh
bin/tests/system/pending/ns1/sign.sh
bin/tests/system/pending/ns2/sign.sh
bin/tests/system/pending/prereq.sh
bin/tests/system/pending/setup.sh
bin/tests/system/pkcs11/clean.sh
bin/tests/system/pkcs11/prereq.sh
bin/tests/system/pkcs11/setup.sh
bin/tests/system/pkcs11/tests.sh
bin/tests/system/pkcs11ssl/clean.sh
bin/tests/system/pkcs11ssl/prereq.sh
bin/tests/system/pkcs11ssl/setup.sh
bin/tests/system/pkcs11ssl/tests.sh
bin/tests/system/redirect/clean.sh
bin/tests/system/redirect/ns1/sign.sh
bin/tests/system/redirect/prereq.sh [new file with mode: 0644]
bin/tests/system/redirect/setup.sh
bin/tests/system/resolver/clean.sh
bin/tests/system/resolver/ns6/keygen.sh
bin/tests/system/resolver/prereq.sh
bin/tests/system/resolver/setup.sh
bin/tests/system/rndc/clean.sh
bin/tests/system/rndc/setup.sh
bin/tests/system/rpz/clean.sh
bin/tests/system/rpz/prereq.sh [new file with mode: 0644]
bin/tests/system/rpz/setup.sh
bin/tests/system/rsabigexponent/bigkey.c
bin/tests/system/rsabigexponent/clean.sh
bin/tests/system/rsabigexponent/ns1/sign.sh
bin/tests/system/rsabigexponent/ns2/sign.sh
bin/tests/system/rsabigexponent/prereq.sh
bin/tests/system/rsabigexponent/setup.sh
bin/tests/system/run.sh
bin/tests/system/smartsign/clean.sh
bin/tests/system/smartsign/prereq.sh
bin/tests/system/smartsign/setup.sh
bin/tests/system/smartsign/tests.sh
bin/tests/system/staticstub/clean.sh
bin/tests/system/staticstub/ns3/sign.sh
bin/tests/system/staticstub/ns4/sign.sh
bin/tests/system/staticstub/prereq.sh [new file with mode: 0755]
bin/tests/system/staticstub/setup.sh
bin/tests/system/statistics/prereq.sh
bin/tests/system/testcrypto.sh [new file with mode: 0644]
bin/tests/system/tkey/clean.sh
bin/tests/system/tkey/keycreate.c
bin/tests/system/tkey/keydelete.c
bin/tests/system/tkey/ns1/named.conf.in
bin/tests/system/tkey/ns1/setup.sh
bin/tests/system/tkey/prereq.sh
bin/tests/system/tkey/setup.sh
bin/tests/system/tkey/tests.sh
bin/tests/system/tsiggss/clean.sh
bin/tests/system/tsiggss/prereq.sh
bin/tests/system/tsiggss/setup.sh
bin/tests/system/tsiggss/tests.sh
bin/tests/system/unknown/ns3/sign.sh
bin/tests/system/unknown/prereq.sh [new file with mode: 0644]
bin/tests/system/unknown/setup.sh
bin/tests/system/upforwd/prereq.sh
bin/tests/system/verify/clean.sh
bin/tests/system/verify/prereq.sh [new file with mode: 0644]
bin/tests/system/verify/setup.sh
bin/tests/system/verify/zones/genzones.sh
bin/tests/system/wildcard/clean.sh
bin/tests/system/wildcard/ns1/sign.sh
bin/tests/system/wildcard/prereq.sh [new file with mode: 0644]
bin/tests/system/wildcard/setup.sh
bin/tests/system/xfer/prereq.sh
bin/tests/system/zonechecks/clean.sh
bin/tests/system/zonechecks/prereq.sh [new file with mode: 0644]
bin/tests/system/zonechecks/setup.sh
configure
configure.in
lib/dns/tests/gost_test.c
lib/dns/tests/nsec3_test.c
util/copyrights

diff --git a/CHANGES b/CHANGES
index 4c254f2f01c671180e1b8241051b52f0be114176..c681eb28a413a8de884f80b0bb2d3fae9be0869c 100644 (file)
--- 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]
index 27bc585e5b3b607fb87054a7dd3ac77acc13292e..71e72bbc047ca8e6f3f91b7ad1139a3482d7b8aa 100644 (file)
@@ -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
index 6628f0d04c3943af3a4312f625d33e246b0cc757..0c15042bcef643a2c25d6a3be88cef402db7107e 100644 (file)
@@ -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
index b2e5aa8af2d1d3341709a0408f7526392a80e5ac..2df0b943ba5c8973d0dcb10918bd9038d00eb33a 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=.
 zonefile=root.db
 infile=root.db.in
index 98332b9cf950cd810b4d7e96ac591bbfd1b55df4..48ecf09e606a90fc21575c059e7a72fc8582c3be 100644 (file)
@@ -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 )
 
index 662b2537cfe252d2b3a4c82c0346ebb720469ccf..f04c382f4c8c9c11ff92e989b2cee8913af5dd9f 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 dumpit () {
        echo "D:${debug}: dumping ${1}"
        cat "${1}" | sed 's/^/D:/'
index 0fe8ba1b2857895737ec6c22d3946ee9dcfcde84..9991a55fbf8f8c93a924bdeaf6c87eacdddda0dc 100644 (file)
 # 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
index 0f615d5358bbda982a086427848ad9700e302052..a559ee92aacbb8a76cde9fd93aa6f123074dad16 100644 (file)
 # 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
 
-echo "I:generating keys and preparing zones"
+. ./clean.sh
 
-../../../tools/genrandom 400 random.data
+test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
 
+echo "I:generating keys and preparing zones"
 cd ns1 && sh keygen.sh
index 9d72fed87822cac98c06d221b91f3a389b2aa349..3f107d2e752a7de787439670ee68f1b53a66697c 100644 (file)
 # 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
 
index 857c4e3ab38565e3d6e3102c865cdc7a4f17cb7b..80141341d5cdfe74f5fe0c55d40ff5b3ee7bbb63 100644 (file)
@@ -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.
index 8e68e2c33ed4bc26e85dc0aa71064942a48e78b7..5068a17bf3e4c362b7c0f2926406f52d6fa96305 100644 (file)
@@ -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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index bd3e9a413fc5f22a5a5480b873ea953f95e01313..d8f3f7cb45db3e58b74aa915bc837311b1499857 100644 (file)
 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
index 2b10e49f70c53967ac944a3c596302dbab60c965..030737a99891739c8cd6ce4447dd142f65128706 100644 (file)
@@ -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-*
index 9854f5b7ceee6e276208e9d5b90a99f7fa4d5a69..1478dd72184d119605b1b37a67e1db85bd8186f0 100755 (executable)
@@ -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
index edcc8f21d4dd32040632a395ffd94893279c3f4c..947a58f1c9a93f43ba0199fa90c6eee40b294dae 100755 (executable)
@@ -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
index 6bdc2f6cc5058f731a83cb9a9010e0fcde9b9fbf..115a4d2268e5679f1c8faaac01710f839c43c44b 100755 (executable)
@@ -23,7 +23,6 @@ echo "I:dlv/ns3/sign.sh"
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
 dlvzone=dlv.utld.
 dlvsets=
 dssets=
index 2bc133e5d6457615977fcf85ab203a4ead3e812a..610f9974f215df18821518d443c90fa6c476e240 100755 (executable)
 # 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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index 92ee8fca02e58b647382636d608323ec95b539e6..2454a4a376a5d0b5001dee331942ef7a809a7f33 100644 (file)
@@ -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)
index dc3faa8483cd22b2063694152128bb93d5b0b2c3..cfa5b62f653116c2352f3dafb3c9e61537adc0d9 100644 (file)
@@ -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
index 4c7f48044d7b766fe756aae513cd61492aa5ab1a..3a6330004e271cff6d11bffd2eb3cf8b079f4623 100644 (file)
 # 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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index 6c9df26f7b27faaf5b7b2488785133c14350d6bc..20f21dbb6a1791af06518fbb93ca4381c9cb129f 100644 (file)
 # 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
index f5fb8e40247b6448c856d136dcfd516b2f70f519..85cef750081e57cf7b86870a2ce1b60e830e84a3 100644 (file)
@@ -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*
index a8837a0aaeb0a30e3e912f7407058f391552ab80..bd32afa81f9085381db7d34b6bf38d88a72a6b0a 100644 (file)
 # 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
index f4bf9d084bb83e4367abb15abcb532b68f1c8559..696e200fbe81f7c3ae9927679782e60c8a5eb177 100644 (file)
 # 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
index a5bd33c693785a15ac4a7efbf1bdbad12ff48ec6..7ebc771d62066db17943b09c3d2fe75ef67e2462 100644 (file)
 # 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.*
index 620096cda175cae750138da8bf6c85108d8745bc..5a79d0947d561445b31fb6e899c4aba73941d129 100644 (file)
@@ -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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index c15357cb9d88a4a0cfda664d1cfafd3856101447..8b2b01c3a842e1863b04d458b560a4cdaf75c4e6 100644 (file)
 # 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
index f97e885002cb14ae55f071094350dc5d1293d23d..e25a3a553a3755e437cd51f7d371f53965ce0502 100644 (file)
@@ -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
index 8fac88586800d02f6ad20948ff1a35fdc22b8ac3..54bf8dc3cd9da6838a1d640ac4ae928d84315212 100644 (file)
@@ -20,8 +20,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=.
 infile=root.db.in
 zonefile=root.db
index 5b5d337a5d21f64b95d8583b0ec8d4026f03bee1..52290e4398b1a695930e254e765c316b9e9f5fd2 100644 (file)
@@ -20,8 +20,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=example.
 infile=example.db.in
 zonefile=example.db
index d5ec859519ced809a36ddca18427935dd7f2f328..2ad13cab3baead88d89e7bfd066eb6c3498d4299 100644 (file)
@@ -20,8 +20,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=secure.example.
 infile=secure.example.db.in
 zonefile=secure.example.db
index e6125ddf61c2b092c84e33022b795c6a37ca616e..b6e21cd640f5a57daa8dbf7fc709429388fb74fb 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=optout-tld
 infile=optout-tld.db.in
 zonefile=optout-tld.db
index b0a4c58c69b1cac2fd1d54d73cd46dfcf39a856d..3edb96111310e8d12825a0dd61adc7068f38e78f 100644 (file)
 # 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
index 4ac5421d144ee065261b43aed1c36b556792fe93..f0170aeeb18d2f8e0ec9d22cdde2434bc1162c2e 100644 (file)
 # 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
 
index e6f04e3d1a4c89193cf36a455f15ce3e004a2b59..e41aeec26d86d167778fdfc4c9d3677c7f52e14a 100644 (file)
@@ -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
index 1e384d00461fa166b1072b32234a065ef55b320d..8ff525af15d38dcff13c489389d62f76739d0240 100644 (file)
 # 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
index b8115f6f62f3cc65a0b7a4a5f98f008f9c9abe41..61b81f2a517316b74258c812d5021fbfe887f750 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=.
 infile=root.db.in
 zonefile=root.db
index 802367798d1363891d12dbb43a874b9be2ad6215..8d4fa780b077866b7e1c779520fbe53084d3f023 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone1=good.
 infile1=good.db.in
 zonefile1=good.db
similarity index 85%
rename from bin/tests/system/dsdigest/prereq.sh.in
rename to bin/tests/system/dsdigest/prereq.sh
index 5cddb4ca25e7c2bfb3ae246392c3c3e4c1465eab..ef21ed5ba8cbc815bb805b36a9f020ab5ef9577f 100644 (file)
 # 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
index 6ba0f72c3e80dc524a2ec1d7445ea7c99b700127..68d34e5bf2f7e421242811c80eae796027f4bb12 100644 (file)
@@ -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
index 5a2a42ad5611c26df1fee781a08e47fabe851899..a7c1a0e0e01efb5216549b9976e9adfdbae81cb1 100644 (file)
 # 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
index 71b739007417723bb692bda61d6d022f8e8cbc1d..f4373bfdcb89e3282e410d49c7543acd230f8002 100644 (file)
 # 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
similarity index 72%
rename from bin/tests/system/ecdsa/prereq.sh.in
rename to bin/tests/system/ecdsa/prereq.sh
index a52fd795b9bc73b444fd1131b994d3f39c3106ef..8a6b44fdfcf48652ec7c9c0a3386b056b389210d 100644 (file)
 # 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
index 6ba0f72c3e80dc524a2ec1d7445ea7c99b700127..68d34e5bf2f7e421242811c80eae796027f4bb12 100644 (file)
@@ -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
index f73a54275f575c52a42d0a756a1f69395023ffbc..7df2517f45787ec644e46b5e17c60785c1866632 100644 (file)
@@ -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.*
index 203e37ebfb7a0e5c8b845bb1fead0ec74a0ac478..e5d66b67778c6d45381594e8f115453ab801f42b 100755 (executable)
@@ -19,7 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
 dlvsets=
 
 zone=signed.
index ff33b10a191839921a88b9143ad2601c07501f0e..6663f3e42e25834926614ccc3058525ed70ececc 100755 (executable)
@@ -19,7 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
 dlvsets=
 
 zone=signed.
index 486067de81e1d315ecf02390ce9d340aa8bfe936..37a822cba5282aa752f500b0973e7c85755a06b8 100644 (file)
@@ -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
     :
index 44147b0a029b63e7b4ad4682dd14217a855f2c3d..9f78dce7b004db0b52c443eaec68cf1c592050a5 100644 (file)
 # 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
index bf62b275d69cc161fe7c2e1295d937777db3c07d..8ebbb24385a0563578c41c2a33ba3b230bc17368 100644 (file)
 # 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
index 854258f03bdc6293099f1acce4bb42f59bcb7374..606c1e69c36d21638712e87e833d7f9a9302f2c6 100644 (file)
 # 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
similarity index 70%
rename from bin/tests/system/gost/prereq.sh.in
rename to bin/tests/system/gost/prereq.sh
index 4b0eeb3ad2ca50ed1a220d228843e6c61541cb33..a49e8ff9c1f20f4c5fdd04109c035a3e3d5e40d8 100644 (file)
 # 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
index bfa5f3eb8f65213ff780a0be1c8a5e1f241daef2..76516019dd656514833c7aac53adb6c9ae6694fc 100644 (file)
@@ -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
index cbbbbb87fd2877866f072d95f373cf52d18d5ada..f5fc31da783aac7957cc5deea54eacb32624283d 100644 (file)
@@ -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*
index cf08f59ee75a56a5efeb4f3cf955a5d435d09ca0..7be6513b4f789ad73ef95fb1b0ebc3fba4cf8883 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=.
 rm -f K.+*+*.key
 rm -f K.+*+*.private
index f95ccffe1a2ca1c11e016e742e6aa46bfeeb2e4a..8ffb5984aa2bdb6b3b3d5be0b353db5893f08e7f 100755 (executable)
@@ -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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index adee4ffb029e457aaf7338e751a54bcaf804fad9..c2c8fb9b2560e395e785e7a3d766b2bd667270d3 100644 (file)
 # 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)
index 36eb47a04bff69f3fb11953ff7c45d34469ad5f8..330cf147f00a57ea5fd582e12833b3f0ae992b1d 100755 (executable)
@@ -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
index 7218ee64a6ca18733e3dc28df9dff9ba76ccf556..c8561434e88916f79e1a55c3aef841785016a2b2 100644 (file)
@@ -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
     :
index e0bd3afe326b3ad0d3082f2102b439bc77516f58..287cbd3623d656db7f4638fa9100d405615b9e01 100755 (executable)
@@ -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
index 34e7a659fca392351d2b27925388ff11608fcb0b..f32bdc2506ea7a5deda7df8bf7cdc37d822e93ef 100755 (executable)
@@ -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 (executable)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index 233f3e6a400cbecc605485445695e830c758d461..0cf966523959ae9f73ef98e17235bb4ea6bef46a 100755 (executable)
 # 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
index 3c33e9dc61acf5bcc6741d17b564c06a764af710..18d45b6bd59f7fb2929fec5bd139d5d3e5593c16 100644 (file)
@@ -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
index 0ff7d25d0c453724256ec894edd42d338abf5080..130935906cdb63298f4781965c8b087e86744f5d 100644 (file)
 # 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
index d5b768926c57453b81c581a8d636203f4671d4e7..95a65f0035972bfa701f843b2e87c4cb8abd8dbb 100644 (file)
 # 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
index e2abe2f99bc16b15777c4a593be4950cfe0297fa..59b914768ba54c244f47f5fc923c4deb59a2248a 100644 (file)
@@ -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
index f8654d65d3e102d4509ff5c247fcb6866d7bcd09..bd519d671f182c8fc47b4914bb01377a3d1004e9 100644 (file)
@@ -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
index e0b947c51f9d2ce10856bab20253cbd2752f4e81..0baa005100cbdeda34396492361ea3f66d3b2511 100644 (file)
 # 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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index bb015142dac8b0d22b1020e137f28bf7a9839850..96d349842f1ad7e29e4fb411dacf28a5db071e51 100644 (file)
 # 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)
index 762d96eeb3a6f7414b708ef297d51e1581d3fc8d..6edb6314cfed6f2c15c79ff9b7531c44f3f0df5d 100644 (file)
@@ -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; }
 
index ec0bcc2494aba36088ec35ff2b694fd5bc788c5b..e8055e9f4fa1870a59b531a96f4081ef95877876 100644 (file)
@@ -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
index c14115b9c9ac69d1ea481898e6e84190eedf5c5e..ffe0e650ed454667fb433b675683e4462ed78bf7 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=.
 infile=root.db.in
 zonefile=root.db
index e9c781673a7a2633f436a344755ab6fc6a372245..76283089a69002950250d6087d686e86528df00f 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 for domain in example example.com; do
        zone=${domain}.
        infile=${domain}.db.in
index 01f29881fc649eeb089c5ad1cd8e666848b6b038..130935906cdb63298f4781965c8b087e86744f5d 100644 (file)
 # 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
index aa44c0605b23e8181ce2cdfffd8cc79ec7473cde..6d6df6c286be209b27c9c617728ad5bde28b915c 100644 (file)
@@ -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
index a0cae316d6b702d48a1c993433558f433ec420a3..24915e85598b718748a4e2dd03541968de7c03d8 100644 (file)
@@ -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
index 9d93c16a59ded300eb7d54035f2d9aea29eb4df4..7aebf1cf2173b403635854b4404962d9e7a56ddd 100644 (file)
 # 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
index 215d6a60f56d315f9c616dff6da9776ff8b6bbcf..ceebff50d4baa0dbad99e24b2da4e30a89dd20e8 100644 (file)
@@ -17,7 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=random.data
 infile=ns1/example.db.in
 
 /bin/echo -n ${HSMPIN:-1234}> pin
index 4599217a44c198e899fee2c372ff98c6f38158f7..047c79b8b4995d23c1cedf969443fdf39f327ebb 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=random.data
-
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p 5300"
 
 status=0
index 39c23cc2cdfeb6230b2a073f037fdfe22ef12e0e..54a46be7362095d8dab66a1f9e9b34d7c5de7dfe 100644 (file)
@@ -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
index d1c6dde86d9e6bf096cfd27139a12b4ac6bf693e..54ed812438dc719fe81cd89bc2940cd0b7f6a218 100644 (file)
 # 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
index afc879667c03edd58a0b64639543fa940a0cc5b9..7046d46481bd0a2ef3515931f346bf07614a92f9 100644 (file)
@@ -17,7 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=random.data
 infile=ns1/example.db.in
 
 /bin/echo -n ${HSMPIN:-1234}> pin
index d82c113b8846cdae0da192f8199147769d919aa4..c22dc4fe1a6b7191b3613b18e1e348fd5d3efdb4 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=random.data
-
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p 5300"
 
 status=0
index d9648bd45b13c99e40125924ebd3cc5220650a4d..14be6c5c7b8dedbe787a5411b5707b6d5688f568 100644 (file)
@@ -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
index 95fe7304a00a88b53368f6ccd145443c2d949772..fcfc492b87df2128f625b6a059736fcbbfb85588 100644 (file)
@@ -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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index 94512ec6d8fbe6b69ae89c989bae789340c438fe..71efcbe9b406d28faa754d3562e17cada8ef7832 100644 (file)
 
 # $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
index 1ad15720436e64eddd888034afdd2281b9aeea73..a721e3f0e5bc250a0ae03733fb7abfafd857888c 100644 (file)
@@ -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
index fed820b85bda1b9bd7aa73a5cec7c785eeaabf10..366f44a4ecf436a6b9200d8d39ee50d49e44ec78 100644 (file)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=example.net
 zonefile="${zone}.db"
 infile="${zonefile}.in"
index 1070f85e905652ce97539379e5e92d7260ed3930..52d1d7d7fcedcbbb981b482846480cc6742479d1 100644 (file)
@@ -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
index cbb918b27cb45ea0ea9fa786d11c41e3bd27dc0c..92b54a14d560eaea6b5bfe6014aaf44c3605415e 100644 (file)
 # 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
index 326e31c568de938ac4007cc4b42206bd8e2a1f9e..62b26a7d04390e96230410f58107ff32c7fe2c26 100644 (file)
 # 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
index a3df13d2625d4fa57217cffb61feb3324488c1d2..62fbaed4c39a402d6b394a638dd25045a1c262d7 100644 (file)
@@ -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
index ed10bcda8dbbe714c6486eea57c761ba921ee8e0..5837e988ebe57e442c6488d13c49cd6a020509d6 100644 (file)
 # 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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index b459a4a205db6242dec68dbd1ca5549585ff9f89..5231a2192f643474acbd6631cce05f52028519a1 100644 (file)
@@ -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
index cf1ee433432a64c68474d8caa4a9dfa9452d3e69..e4a463f9e3aaab7021346a511cf8dc9837c66236 100644 (file)
@@ -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_);
index 0d84f75563dede2cdedc84585e814c517453d719..c2466c9d6c141897bfbf95dac049c0ae8559c1b5 100644 (file)
 # 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
index 7e0854f18e77147991d46c94247c36e7e497cab4..d481b45a2f75e57d601ead7aa89ed9724fac6c6e 100755 (executable)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=.
 infile=root.db.in
 zonefile=root.db
index e177b93f3cba8629ac4bc5ade902b2e1ccf503d5..968ab498ac3ef3bb2c41ad5d3995d4bf6c635eca 100755 (executable)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=example.
 infile=example.db.in
 outfile=example.db.bad
index 99767a2d1434ec6709b22629aaaf61ebf02c325c..d7c6875714d54d46c18d5a5c692ac8fe48a8dd5e 100644 (file)
 # 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
index bf24be6c514cd7f948cb87368e1de9ae14e7ad13..72ebe144694f2a6332812ad41d244f920bc3f92d 100644 (file)
 # 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
index cd0cf85a0f88d8119df3c5d3c19fff6363765278..c388f8ae79d4147a571b687e352362b18e80735f 100644 (file)
@@ -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 "$@" )
index 407a6eb03436ba9b9b0acd2e712ee863aaa4e2bb..a2766d2e00f098266c158c1f339828100a07487d 100644 (file)
@@ -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
index 1b28e5974627770df010646d5e83ce57b25efb4f..b9de2594b4bbbe5678e2e50086f923deb97f0181 100644 (file)
 # 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
index a25d371600abd2e5ef42ecfe2a7d634cb52392ad..37c3656f3182c2422d414249840e7a691afbd93f 100644 (file)
@@ -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
index e0e2244d4a9e805cc07f30316bfd6a96c4e8886d..6b995ea5cb41d61c5b2248eb2d6a0d23a7fc9b16 100644 (file)
@@ -21,8 +21,6 @@ SYSTEMTESTTOP=..
 
 status=0
 
-RANDFILE=./random.data
-
 pzone=parent.nil
 pfile=parent.db
 
index 8490c6767f6a006019d60ecd685be579f33a03b2..4992aeb8878415cf7ef8a3e7b4992623d1d75766 100755 (executable)
 # 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
index f5b16c6e9b3c99b33a211d13c7f86ca271b35ca3..2aea1a45cd426d249a348ae26b10bf6e98754ee6 100755 (executable)
@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 zone=example.
 infile=example.db.in
 zonefile=example.db
index 464d917d448fef57703799f82a8b9935db9accb0..f85e5f5770409d326d6b7c9b5800bff78c2262d4 100755 (executable)
@@ -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 (executable)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index 4c5a55cd255d611eb7dae231505fca302968ecb4..4c40b87ddd09f29424de1392872177f8a51fc9f6 100755 (executable)
 # 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
index ec2be34417186811317babfbb660f64474dc60be..b7566ac4b37365a0adabc1cbc411fba24c202545 100644 (file)
@@ -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 (file)
index 0000000..c86966f
--- /dev/null
@@ -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
index 649401d90db42c86702199f0c2926018603c2cb2..b1d017c910c49426ecad556b4165a443466ebeff 100644 (file)
@@ -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
index 9010b43cf5350386c6d0e1e1a5590a858b120551..bd0a5fee41a5971e4172fec3ec71b6da0bb94108 100644 (file)
@@ -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;
index 1bb33e85febf3756c95bb84e3b19c903b1d02bed..304b89c3080805e38bf9aa196b006c4eedbb003f 100644 (file)
@@ -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;
index 087d8df5289c619836a42472d4510b0b813aab61..2242b5874d18a1f7d1c1639dfc47b7d34d921459 100644 (file)
@@ -32,6 +32,7 @@ options {
        tkey-domain "server";
        tkey-dhkey "server" KEYID;
        allow-query-cache { any; };
+       random-device "RANDFILE";
 };
 
 key rndc_key {
index 7a6e7501ee07b83baeac2e9dcae713060b618f0a..45d18970772c418a58e9a4d79a9f13b62675b3f1 100644 (file)
 # 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
index 06d3a1e00b0b4d31e24a3f50ccfd7b3f1eb39af5..0a5f897b6a692f5f49f8a93893e185d47cc0e5ac 100644 (file)
 # 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
index 302ad823ead3191bc7144d83f1b1070f30074253..5f273e93ae397bd4eff7caecbe7b5b350d8bcd24 100644 (file)
 # 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
index f60fe7a2f4fd2b4848854c298c602fddb496a9f3..420e77f9c3f08282b14180db3b1440911b578ded 100644 (file)
@@ -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
index e67d0b9cc1ab0748fb07c4f2189d3735be32399c..eeb9aab5e563230a39470c2adf62343f8664775a 100644 (file)
@@ -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
index c2d3278c8974f7e937861bd27c271b403c430dfe..a824dfe702d05f4954eee91877dc99f5b3f47f92 100644 (file)
@@ -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
 # 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
index 00222bad0534ab51be24f31e7b4b8f53aae78237..2853e89c84dfc3d1277e5b6ee2a172979f17735b 100644 (file)
 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
index 005d0af150a474c862568104198e051572545d49..a8220633e05ae0d6a928afcf4876e54312b50cd4 100644 (file)
@@ -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 <<END > /dev/null 2>&1 || ret=1
+$NSUPDATE -R $RANDFILE -k ns1/Kkey.example.nil.*.private <<END > /dev/null 2>&1 || ret=1
 server 10.53.0.1 5300
 zone example.nil
 update add fred.example.nil 120 cname foo.bar.
index 6a0135e989e7ebc6772954805e33efc12ffd9a9f..7fd84f28ba2a5506cd8c54bf24b053fa9186803d 100644 (file)
@@ -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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index 921e6ed5209f6d7603d11c7a9816375b95b8bc4c..d0064e9d7642298180c93ee353989afe9d40ed2e 100644 (file)
 # 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)
index 4774d4e3b15992b5fb184e941991cbeba69b6028..b7566ac4b37365a0adabc1cbc411fba24c202545 100644 (file)
@@ -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
     :
index 509fc6509137f691f757bc9e79ffb8bc333460f3..f58be5b0fb00b613a30631e6aa638734cd7986a2 100644 (file)
@@ -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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index 4d65286173639d764e5c7986ee6eb9f9ba3b185a..fddc89b8e3a8eb415dc2269532ecb4795d372dca 100644 (file)
 # 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)
index 59622b083702fd451484feddbd9255a844a7765d..a89dc40f219a353720d76126c1dc957ae33225b2 100644 (file)
@@ -17,8 +17,6 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=../random.data
-
 dumpit () {
        echo "D:${debug}: dumping ${1}"
        cat "${1}" | sed 's/^/D:/'
index 03b96a8f615a358fa2ea306a916177f620a9145b..7343237bf07ce5b543a0c5142fbe537c8234ff6e 100644 (file)
@@ -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
index 1ad5207ae9592c329f627abd08065b87613ea633..29db82718ea6b43acd6a5b9f41fe245797363661 100755 (executable)
@@ -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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index fb4816df4645cca35b7263024f5372df5e0d4dfb..67f1295c634d3381a7c7fb9f766040cc306ba46d 100644 (file)
@@ -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)
index 81aede39214f500a90432d806190a625c4610d97..b68cc58e6d27d604679a0610c2cc64dfb2d86b9f 100644 (file)
@@ -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
index 3ea48c648abaa4f5fa272300a417dc99ea098d60..334db5226822a46b77ed5f6e5b789379fe45b90e 100644 (file)
 # 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 (file)
index 0000000..d90b9b2
--- /dev/null
@@ -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
index aaea60c5bc9f752721a09d574a9f33fd4bf1476c..286898c28b1b1d5910e77f128df65233e005ddd5 100644 (file)
 # 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
index e34f59d701dab2a34a27951a1f5c9add16f76009..b3841488099e9d1c77839fd32a22d887263cbcc9 100755 (executable)
--- 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"
 
 
 #
     "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" ;;
index c92ad47c9b8ee7d2fab2d2d625ba2a67aafa58dc..6b8443ad519e20af0c599d56b9c8369c0f32ab43 100644 (file)
@@ -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
index 68283d0963881fb3e554c0fbc57404b03f8a49f6..79caf8c3f01e8173922509f325eaef895eb47c85 100644 (file)
@@ -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
 /*
index 99e222c74099044a148bdd2b0f8a5b65de7179fb..dec0dc2e54da3b656b76a21ec35a7393431a202c 100644 (file)
@@ -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());
 }
index db20db722a6fdcaa7a09d61422ce8306a3e07836..2f7930bed7607d6fbbcac85f389642ea221f8edd 100644 (file)
 ./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
 ./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
 ./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
 ./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                      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
 ./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                      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
 ./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
 ./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
 ./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
 ./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
 ./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
 ./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
 ./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
 ./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                  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                  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
 ./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
 ./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
 ./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
 ./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