diff --git a/CHANGES b/CHANGES index 07207f6285..4a665fdca7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ + 190. [cleanup] The DNSSEC tools have been moved to a separate + directory dnssec/ and given the following new, + more descriptive names: + + dnssec-keygen + dnssec-signzone + dnssec-signkey + dnssec-makekeyset + + Their command line arguments have also been changed to + be more consistent. dnssec-keygen now prints the + name of the generated key files (sans extension) + on standard output to simplify its use in automated + scripts. + 189. [func] isc_time_secondsastimet(), a new function, will ensure that the number of seconds in an isc_time_t does not exceed the range of a time_t, or return ISC_R_RANGE. diff --git a/bin/Makefile.in b/bin/Makefile.in index 2371da4564..f16047a475 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -17,7 +17,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -SUBDIRS = named lwresd rndc dig tests +SUBDIRS = named lwresd rndc dig dnssec tests TARGETS = @BIND9_MAKE_RULES@ diff --git a/bin/dnssec/.cvsignore b/bin/dnssec/.cvsignore new file mode 100644 index 0000000000..3469485224 --- /dev/null +++ b/bin/dnssec/.cvsignore @@ -0,0 +1,5 @@ +Makefile +dnssec-keygen +dnssec-makekeyset +dnssec-signkey +dnssec-signzone diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in new file mode 100644 index 0000000000..b9e71783f4 --- /dev/null +++ b/bin/dnssec/Makefile.in @@ -0,0 +1,75 @@ +# Copyright (C) 1998, 1999, 2000 Internet Software Consortium. +# +# Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS +# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE +# CONSORTIUM 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. + +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + +@BIND9_INCLUDES@ + +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} + +CDEFINES = +CWARNINGS = + +DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ +ISCLIBS = ../../lib/isc/libisc.@A@ + +DNSDEPLIBS = ../../lib/dns/libdns.@A@ +ISCDEPLIBS = ../../lib/isc/libisc.@A@ + +LIBS = @LIBS@ + +SUBDIRS = + +# Alphabetically +TARGETS = dnssec-keygen \ + dnssec-makekeyset \ + dnssec-signkey \ + dnssec-signzone \ + +SRCS = dnssec-keygen.c \ + dnssec-makekeyset.c \ + dnssec-signkey.c \ + dnssec-signzone.c + +@BIND9_MAKE_RULES@ + +dnssec-keygen: dnssec-keygen.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL} ${CC} ${CFLAGS} -o $@ dnssec-keygen.@O@ \ + ${DNSLIBS} ${ISCLIBS} ${LIBS} + +dnssec-makekeyset: dnssec-makekeyset.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL} ${CC} ${CFLAGS} -o $@ dnssec-makekeyset.@O@ \ + ${DNSLIBS} ${ISCLIBS} ${LIBS} + +dnssec-signkey: dnssec-signkey.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL} ${CC} ${CFLAGS} -o $@ dnssec-signkey.@O@ \ + ${DNSLIBS} ${ISCLIBS} ${LIBS} + +dnssec-signzone: dnssec-signzone.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL} ${CC} ${CFLAGS} -o $@ dnssec-signzone.@O@ \ + ${DNSLIBS} ${ISCLIBS} ${LIBS} + +clean distclean:: + rm -f ${TARGETS} + +installdirs: + if [ ! -d ${DESTDIR}${sbindir} ]; then \ + mkdir ${DESTDIR}${sbindir}; \ + fi + +install:: ${TARGSTS} installdirs + ${LIBTOOL} ${INSTALL_PROGRAM} ${TARGETS} ${DESTDIR}${sbindir} diff --git a/bin/tests/system/conf.sh b/bin/tests/system/conf.sh index 4f2b11dff3..e4f8aad03e 100755 --- a/bin/tests/system/conf.sh +++ b/bin/tests/system/conf.sh @@ -6,10 +6,10 @@ TOP="`cd ../../..; pwd`" NAMED=$TOP/bin/named/named -KEYGEN=$TOP/bin/tests/keygen -SIGNER=$TOP/bin/tests/signer -KEYSIGNER=$TOP/bin/tests/keysigner -KEYSETTOOL=$TOP/bin/tests/keysettool +KEYGEN=$TOP/bin/dnssec/dnssec-keygen +SIGNER=$TOP/bin/dnssec/dnssec-signzone +KEYSIGNER=$TOP/bin/dnssec/dnssec-signkey +KEYSETTOOL=$TOP/bin/tests/dnssec-makekeyset SUBDIRS="xfer dnssec xferquota" diff --git a/configure b/configure index de032f24bf..4b8ecea147 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.135 +# From configure.in Revision: 1.136 @@ -4038,6 +4038,7 @@ trap 'rm -fr `echo "make/rules bin/tests/mem/Makefile bin/tests/sockaddr/Makefile bin/tests/headerdep_test.sh + bin/dnssec/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff --git a/configure.in b/configure.in index aae028089d..cea124dd10 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ dnl PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS dnl ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS dnl SOFTWARE. -AC_REVISION($Revision: 1.135 $) +AC_REVISION($Revision: 1.136 $) AC_PREREQ(2.13) @@ -908,4 +908,5 @@ AC_OUTPUT( bin/tests/mem/Makefile bin/tests/sockaddr/Makefile bin/tests/headerdep_test.sh + bin/dnssec/Makefile ) diff --git a/util/copyrights b/util/copyrights index 843a299607..2948a425fb 100644 --- a/util/copyrights +++ b/util/copyrights @@ -6,6 +6,9 @@ ./aclocal.m4 X 1999,2000 ./bin/.cvsignore X 1999,2000 ./bin/Makefile.in MAKE 1998,1999,2000 +./bin/dnssec/Makefile.in MAKE 2000 +./bin/dnssec/dnssec-signzone.c C 1999,2000 +./bin/dnssec/dnssec-keygen.c PORTION 1999,2000 ./bin/lwresd/.cvsignore X 2000 ./bin/lwresd/Makefile.in MAKE 2000 ./bin/lwresd/client.c C 2000 @@ -141,7 +144,6 @@ ./bin/tests/gxbn_test.c C 2000 ./bin/tests/headerdep_test.sh.in SH 2000 ./bin/tests/inter_test.c C 2000 -./bin/tests/keygen.c PORTION 1999,2000 ./bin/tests/lex_test.c C 1998,1999,2000 ./bin/tests/lfsr_test.c C 1999,2000 ./bin/tests/log_test.c C 1999,2000 @@ -254,7 +256,6 @@ ./bin/tests/sdig.c C 1999,2000 ./bin/tests/serial_test.c C 1999,2000 ./bin/tests/shutdown_test.c C 1998,1999,2000 -./bin/tests/signer.c C 1999,2000 ./bin/tests/sock_test.c C 1998,1999,2000 ./bin/tests/sockaddr/.cvsignore X 1999,2000 ./bin/tests/sockaddr/Makefile.in MAKE 1999,2000