From acc63b06d9e4e2137950dabddcccd17d8b336ca0 Mon Sep 17 00:00:00 2001
From: Olafur Gudmundsson <source@isc.org>
Date: Fri, 15 Dec 2000 05:58:08 +0000
Subject: [PATCH] [615] dnssec-signzone did not like child signed keysets with
 multiple 	signatures. (coredump) [616] After consulting with Andreas I
 added some more timing statistics 	when statistics are requesed.

---
 CHANGES                      |  4 ++++
 bin/dnssec/dnssec-signzone.c | 32 +++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 17ab449944..541c2583cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+ 616.	[func]		dnssec-signzone prints timing statistics for signing.
+
+ 615.	[bug]		dnssec-signzone did not like child keysets signed by
+			multiple keys. 
 
  614.	[bug]		Checks for uninitialized link fields were prone
 			to false positives, causing assertion failures.
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 27c9c29196..6be0634a98 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.122 2000/12/12 20:21:34 bwelling Exp $ */
+/* $Id: dnssec-signzone.c,v 1.123 2000/12/15 05:58:08 ogud Exp $ */
 
 #include <config.h>
 
@@ -35,6 +35,7 @@
 #include <isc/string.h>
 #include <isc/task.h>
 #include <isc/util.h>
+#include <isc/time.h>
 
 #include <dns/db.h>
 #include <dns/dbiterator.h>
@@ -584,10 +585,10 @@ importparentsig(dns_diff_t *diff, dns_name_t *name, dns_rdataset_t *set) {
 				break;
 			dns_rdata_reset(&newrdata);
 		}
-		if (result != ISC_R_SUCCESS)
-			break;
 		dns_rdata_reset(&newrdata);
 		dns_rdata_reset(&rdata);
+		if (result != ISC_R_SUCCESS)
+			break;
 	}
 	if (result != ISC_R_NOMORE)
 		goto failure;
@@ -604,6 +605,7 @@ importparentsig(dns_diff_t *diff, dns_name_t *name, dns_rdataset_t *set) {
 		check_result(result, "dns_difftuple_create");
 		dns_diff_append(diff, &tuple);
 		result = dns_rdataset_next(&sigset);
+		dns_rdata_reset(&rdata);
 	}
 	if (result == ISC_R_NOMORE)
 		result = ISC_R_SUCCESS;
@@ -1479,6 +1481,8 @@ main(int argc, char *argv[]) {
 	char *origin = NULL, *file = NULL, *output = NULL;
 	char *randomfile = NULL;
 	char *endp;
+	isc_time_t timer_start, timer_finish;
+	isc_uint64_t micro_sec, sigs_sec;
 	signer_key_t *key;
 	isc_result_t result;
 	isc_log_t *log = NULL;
@@ -1489,6 +1493,8 @@ main(int argc, char *argv[]) {
 	isc_textregion_t r;
 	isc_task_t **tasks = NULL;
 
+
+
 	check_result(isc_app_start(), "isc_app_start");
 
 	result = isc_mem_create(0, 0, &mctx);
@@ -1633,6 +1639,7 @@ main(int argc, char *argv[]) {
 		origin = file;
 
 	gdb = NULL;
+	isc_time_now(&timer_start);
 	loadzone(file, origin, rdclass, &gdb);
 	gorigin = dns_db_origin(gdb);
 
@@ -1655,8 +1662,8 @@ main(int argc, char *argv[]) {
 			result = dst_key_fromnamedfile(argv[i],
 						       DST_TYPE_PRIVATE,
 						       mctx, &newkey);
-			if (result != ISC_R_SUCCESS)
-				usage();
+			if (result != ISC_R_SUCCESS) 
+				fatal("cannot load key %s", argv[i]); 
 
 			key = ISC_LIST_HEAD(keylist);
 			while (key != NULL) {
@@ -1776,6 +1783,10 @@ main(int argc, char *argv[]) {
 	(void) isc_app_finish();
 
 	if (printstats) {
+		isc_time_now(&timer_finish);
+
+		micro_sec = isc_time_microdiff( &timer_finish, &timer_start);
+
 		printf("Signatures generated:               %d\n",
 		       nsigned);
 		printf("Signatures retained:                %d\n",
@@ -1786,6 +1797,17 @@ main(int argc, char *argv[]) {
 		       nverified);
 		printf("Signatures unsuccessfully verified: %d\n",
 		       nverifyfailed);
+#define SEC_CONST 1000000
+		printf("Runtime in seconds                  %u.%2.2u\n", 
+		       (isc_int32_t) micro_sec/SEC_CONST, 
+		       (isc_int32_t) (micro_sec%SEC_CONST));
+		if (nsigned > 0 && micro_sec > 0) {
+			sigs_sec = nsigned;
+			sigs_sec *= 100 * SEC_CONST / micro_sec;
+			printf("Signatures/second                   %u.%2u\n", 
+			       (u_int32_t) sigs_sec/100, 
+			       (u_int32_t) sigs_sec%100);
+		}
 	}
 
 	return (0);