From: Willem Toorop <willem@NLnetLabs.nl>
Date: Fri, 23 Sep 2011 09:14:15 +0000 (+0000)
Subject: Clarified -p option in ldns-verify-zone.
X-Git-Tag: release-1.6.11~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1ebe17c8a84f819caeb7e3b9bdd925eac816e4a;p=thirdparty%2Fldns.git

Clarified -p option in ldns-verify-zone.
Bugfix #410: Don't leak sha temporary data on the stack
Fix tests to take (DY)LD_LIBRARY_PATH into account
---

diff --git a/Changelog b/Changelog
index 3747e8c9..68f9abfd 100644
--- a/Changelog
+++ b/Changelog
@@ -3,7 +3,7 @@
 	* bugfix #392: Apex only and percentage checks for ldns-verify-zone 
 	  (thanks Miek Gieben)
 	* bugfix #398: Allow NSEC RRSIGs before the NSEC3 in ldns-verify-zone
-	* Fix python site package path to /usr/lib64.
+	* Fix python site package path from sitelib to sitearch for pyldns.
 	* Fix python api to support python2 and python3 (thanks Karel Slany).
 	* bugfix #401: Correction of date/time functions algorithm and 
 	  prevention of an infinite loop therein
@@ -40,6 +40,7 @@
 	  The ldnsx module is automatically installed when --with-pyldns is
 	  used with configuring, but may explicitly be excluded with the
 	  --without-pyldnsx option to configure.
+	* bugfix #410: Fix clearing out temporary data on stack in sha2.c
 
 1.6.10	2011-05-31
 	* New example tool added: ldns-gen-zone.
diff --git a/examples/ldns-verify-zone.1 b/examples/ldns-verify-zone.1
index 175ee2dd..092fb213 100644
--- a/examples/ldns-verify-zone.1
+++ b/examples/ldns-verify-zone.1
@@ -20,7 +20,9 @@ Apex only, check only the zone apex
 
 .TP
 \fB-p\fR \fI[0-100]\fR
-Only check this percentage of the zone. Defaults to 100.
+Only check this percentage of the zone.
+Which names to check is determined randomly.
+Defaults to 100.
 
 .TP
 \fB-h\fR
diff --git a/sha2.c b/sha2.c
index 26b7716a..6ba4ab5c 100644
--- a/sha2.c
+++ b/sha2.c
@@ -605,7 +605,7 @@ void ldns_sha256_final(sha2_byte digest[], ldns_sha256_CTX* context) {
 	}
 
 	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(ldns_sha256_CTX));
 	usedspace = 0;
 }
 
@@ -915,7 +915,7 @@ void ldns_sha512_final(sha2_byte digest[], ldns_sha512_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(ldns_sha512_CTX));
 }
 
 unsigned char *
@@ -968,7 +968,7 @@ void ldns_sha384_final(sha2_byte digest[], ldns_sha384_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(ldns_sha384_CTX));
 }
 
 unsigned char *
diff --git a/test/03-run.tpkg b/test/03-run.tpkg
index 2eaf75fe..dc40c10b 100644
Binary files a/test/03-run.tpkg and b/test/03-run.tpkg differ
diff --git a/test/04-run-normal.tpkg b/test/04-run-normal.tpkg
index ff024596..5776c48b 100644
Binary files a/test/04-run-normal.tpkg and b/test/04-run-normal.tpkg differ
diff --git a/test/18-drill-tests1.tpkg b/test/18-drill-tests1.tpkg
index 6fc5dd94..0dd5163a 100644
Binary files a/test/18-drill-tests1.tpkg and b/test/18-drill-tests1.tpkg differ