Remove dummy PATH_RANDOMDEV and CHECK_DSA defines

diff --git a/acconfig.h b/acconfig.h
index d3b0ee4d3a5ffb4e115bf15686f091dcfdb10452..369986e9c8551a3826014378706716d7e7afc10f 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,9 +17,6 @@
  ***/
 @TOP@
 
-/** define if the system has a random number generating device */
-#undef PATH_RANDOMDEV
-
 /** define if pthread_attr_getstacksize() is available */
 #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE
 

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 6c77ce7e5884d0ac362701743e7820186337d165..a440a31a760f30e2df2a26a84cd638c518602bc5 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -148,7 +148,6 @@ PYTHON=@PYTHON@
 #
 # Determine if we support various optional features.
 #
-CHECK_DSA=@CHECK_DSA@
 HAVEXMLSTATS=@XMLSTATS@
 HAVEJSONSTATS=@JSONSTATS@
 ZLIB=@ZLIB@

diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index 737da36d3f1a32a37ab2b6dcd7ae2802b0df1790..da89e167c24059265c252dabc63f21ceffbab9f6 100644 (file)
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -147,7 +147,6 @@ PYTHON=@PYTHON@
 #
 # Determine if we support various optional features.
 #
-CHECK_DSA=@CHECK_DSA@
 HAVEXMLSTATS=@XMLSTATS@
 HAVEJSONSTATS=@JSONSTATS@
 ZLIB=@ZLIB@

diff --git a/bin/tests/system/inline/.gitignore b/bin/tests/system/inline/.gitignore
deleted file mode 100644 (file)
index 67c4611..0000000
--- a/bin/tests/system/inline/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-checkdsa.sh

diff --git a/bin/tests/system/inline/checkdsa.sh.in b/bin/tests/system/inline/checkdsa.sh.in
deleted file mode 100644 (file)
index 5b6ea2e..0000000
--- a/bin/tests/system/inline/checkdsa.sh.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-if [ "@CHECK_DSA@" -eq 0 ]; then
-       exit 1
-fi
-if [ ! -r /dev/random -o ! -r /dev/urandom ]; then
-       exit 1
-fi
-
-exit 0

diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh
index 09e3fc8874c04da460409cbe7503c6b921e6d7a6..eeb03032fd43ac79fc1b6ce4a57f3a67b75bf379 100755 (executable)
--- a/bin/tests/system/inline/ns3/sign.sh
+++ b/bin/tests/system/inline/ns3/sign.sh
@@ -135,22 +135,6 @@ rm -f K${zone}.+*+*.private
 
 for alg in ECDSAP256SHA256 NSEC3RSASHA1 DSA
 do
-    case $alg in
-        DSA)
-            $SHELL ../checkdsa.sh 2> /dev/null || continue
-            checkfile=../checkdsa
-            touch $checkfile ;;
-        ECDSAP256SHA256)
-            fail=0
-            $KEYGEN -q -a ecdsap256sha256 test > /dev/null 2>&1 || fail=1
-            rm -f Ktest*
-            [ $fail != 0 ] && continue
-            $SHELL ../checkdsa.sh 2> /dev/null || continue
-            checkfile=../checkecdsa
-            touch $checkfile ;;
-        *) ;;
-    esac
-
     k1=`$KEYGEN -q -a $alg -b 1024 -n zone -f KSK $zone`
     k2=`$KEYGEN -q -a $alg -b 1024 -n zone $zone`
     k3=`$KEYGEN -q -a $alg -b 1024 -n zone $zone`
@@ -161,9 +145,9 @@ do
     rm -f $k1.private 
     mv $k1.key a-file
     $IMPORTKEY -P now -D now+3600 -f a-file $zone > /dev/null 2>&1 ||
-        ( echo "importkey failed: $alg"; rm -f $checkfile )
+        ( echo "importkey failed: $alg" )
     rm -f $k2.private 
     mv $k2.key a-file
     $IMPORTKEY -f a-file $zone > /dev/null 2>&1 ||
-        ( echo "importkey failed: $alg"; rm -f $checkfile )
+        ( echo "importkey failed: $alg" )
 done

diff --git a/config.h.in b/config.h.in
index 9c7a06992b0cec32b8b10639e8c32a79a80cf330..e0e624ad6731ad9efbf21ea58d5fad7451760757 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -17,9 +17,6 @@
  *** it does not get installed.
  ***/
 
-/** define if the system has a random number generating device */
-#undef PATH_RANDOMDEV
-
 /** define if pthread_attr_getstacksize() is available */
 #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE
 

diff --git a/config.h.win32 b/config.h.win32
index 4f19200b1dfebea6781a8048f0588b56fe83e1cd..01a0cddbcff2173d507d1fad619b8b3e6283b91e 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -227,9 +227,6 @@ typedef __int64 off_t;
  */
 #include <versions.h>
 
-/* We actually are using the CryptAPI and not a device */
-#define PATH_RANDOMDEV         "CryptAPI"
-
 #include <stddef.h>
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/configure b/configure
index 00ca246ca0ca24063b9d66cacf5aa4b1918bc947..81d41b1998523d1d09de8143025f75ea5a7cb538 100755 (executable)
--- a/configure
+++ b/configure
@@ -755,7 +755,6 @@ PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
-CHECK_DSA
 GEOIPLINKOBJS
 GEOIPLINKSRCS
 ISC_PLATFORM_NORETURN_POST
@@ -14442,22 +14441,6 @@ esac
 
 
 
-# XXXOND: Change this to deterministic DSA generation
-#
-# Only check dsa signature generation on these platforms when performing
-# system tests.
-#
-CHECK_DSA=0
-if grep "#define PATH_RANDOMDEV " confdefs.h > /dev/null
-then
-       case "$host" in
-       *darwin*|*freebsd*)
-               CHECK_DSA=1
-               ;;
-       esac
-fi
-
-
 #
 # Do we have arc4random(), etc ?
 #
@@ -21513,7 +21496,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/delv/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/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/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/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.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/irs/tests/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/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/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh fuzz/Makefile"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/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/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/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/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.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/irs/tests/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/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/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh fuzz/Makefile"
 
 
 #
@@ -22563,7 +22546,6 @@ do
     "bin/tests/system/dlzexternal/ns1/dlzs.conf") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dlzexternal/ns1/dlzs.conf" ;;
     "bin/tests/system/dyndb/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dyndb/Makefile" ;;
     "bin/tests/system/dyndb/driver/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dyndb/driver/Makefile" ;;
-    "bin/tests/system/inline/checkdsa.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/inline/checkdsa.sh" ;;
     "bin/tests/system/pipelined/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/pipelined/Makefile" ;;
     "bin/tests/system/rndc/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/rndc/Makefile" ;;
     "bin/tests/system/rpz/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/rpz/Makefile" ;;

diff --git a/configure.in b/configure.in
index 652dd201992322ed0d5c7c656604a608c63bf285..608e62a59cf4b536320a32e3b33e0cc632c2ca15 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -667,22 +667,6 @@ esac
 AC_SUBST(GEOIPLINKSRCS)
 AC_SUBST(GEOIPLINKOBJS)
 
-# XXXOND: Change this to deterministic DSA generation
-#
-# Only check dsa signature generation on these platforms when performing
-# system tests.
-#
-CHECK_DSA=0
-if grep "#define PATH_RANDOMDEV " confdefs.h > /dev/null
-then
-       case "$host" in
-       *darwin*|*freebsd*)
-               CHECK_DSA=1
-               ;;
-       esac
-fi
-AC_SUBST(CHECK_DSA)
-
 #
 # Do we have arc4random(), etc ?
 #
@@ -3077,7 +3061,6 @@ AC_CONFIG_FILES([
        bin/tests/system/dlzexternal/ns1/dlzs.conf
        bin/tests/system/dyndb/Makefile
        bin/tests/system/dyndb/driver/Makefile
-       bin/tests/system/inline/checkdsa.sh
        bin/tests/system/pipelined/Makefile
        bin/tests/system/rndc/Makefile
        bin/tests/system/rpz/Makefile

diff --git a/util/copyrights b/util/copyrights
index 6b74dc659c96bc6b01ae8dfc17e859582a950cf9..9facfc4b60c4b675a4f4601c1a7f4e62ff7e3277 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1331,7 +1331,6 @@
 ./bin/tests/system/idna/tests.sh               SH      2018
 ./bin/tests/system/ifconfig.bat                        BAT     2016,2018
 ./bin/tests/system/ifconfig.sh                 SH      2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2016,2018
-./bin/tests/system/inline/checkdsa.sh.in       SH      2013,2014,2016,2018
 ./bin/tests/system/inline/clean.sh             SH      2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/inline/ns1/named.conf.in    CONF-C  2011,2016,2018
 ./bin/tests/system/inline/ns1/root.db.in       ZONE    2011,2012,2013,2016,2017,2018

diff --git a/win32utils/Configure b/win32utils/Configure
index c2b63a0c37eef04501e9eeab80b411b82fdd3c35..d2eed20e833eeab3affbc845dc6af7d70caced73 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -233,8 +233,7 @@ my @substdefp = ();
 
 my %configtest;
 
-my @substtest = ("CHECK_DSA",
-                 "CHECKDS",
+my @substtest = ("CHECKDS",
                  "COVERAGE",
                  "DNSTAP",
                  "FSTRM_CAPTURE",
@@ -2837,9 +2836,6 @@ sub makeinstallfile {
 
 # Adjust system tests
 
-# WIN32 not a BSD
-$configtest{"CHECK_DSA"} = 0;
-
 # dnstap not supported
 #$configtest{"DNSTAP"} = "dnstap";
 #$configtest{"FSTRM_CAPTURE"} = "fstrm_capture";