From 5b148f96cc1a7ecc679493bf5d0db9ca30feba73 Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Wed, 16 Aug 2000 00:30:56 +0000
Subject: [PATCH] An error in a .private file could lead to an assertion.

---
 lib/dns/sec/dst/bsafe_link.c     | 3 ++-
 lib/dns/sec/dst/hmac_link.c      | 3 ++-
 lib/dns/sec/dst/openssl_link.c   | 3 ++-
 lib/dns/sec/dst/openssldh_link.c | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/dns/sec/dst/bsafe_link.c b/lib/dns/sec/dst/bsafe_link.c
index faa21a44d5..fb39339186 100644
--- a/lib/dns/sec/dst/bsafe_link.c
+++ b/lib/dns/sec/dst/bsafe_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: bsafe_link.c,v 1.33 2000/08/01 01:27:44 tale Exp $
+ * $Id: bsafe_link.c,v 1.34 2000/08/16 00:30:53 bwelling Exp $
  */
 
 #if defined(DNSSAFE)
@@ -465,6 +465,7 @@ dnssafersa_destroy(dst_key_t *key) {
 		B_DestroyKeyObject(&rkey->rk_Public_Key);
 	memset(rkey, 0, sizeof(*rkey));
 	isc_mem_put(mctx, rkey, sizeof(*rkey));
+	key->opaque = NULL;
 }
 
 static isc_result_t
diff --git a/lib/dns/sec/dst/hmac_link.c b/lib/dns/sec/dst/hmac_link.c
index d79272bb7f..e68d7b7dad 100644
--- a/lib/dns/sec/dst/hmac_link.c
+++ b/lib/dns/sec/dst/hmac_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: hmac_link.c,v 1.43 2000/08/02 15:33:11 tale Exp $
+ * $Id: hmac_link.c,v 1.44 2000/08/16 00:30:54 bwelling Exp $
  */
 
 #include <config.h>
@@ -162,6 +162,7 @@ hmacmd5_destroy(dst_key_t *key) {
 	HMAC_Key *hkey = key->opaque;
 	memset(hkey, 0, sizeof(HMAC_Key));
 	isc_mem_put(key->mctx, hkey, sizeof(HMAC_Key));
+	key->opaque = NULL;
 }
 
 static isc_result_t
diff --git a/lib/dns/sec/dst/openssl_link.c b/lib/dns/sec/dst/openssl_link.c
index 4e0af2145b..baf49a7244 100644
--- a/lib/dns/sec/dst/openssl_link.c
+++ b/lib/dns/sec/dst/openssl_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.35 2000/08/10 22:28:33 bwelling Exp $
+ * $Id: openssl_link.c,v 1.36 2000/08/16 00:30:55 bwelling Exp $
  */
 #if defined(OPENSSL)
 
@@ -225,6 +225,7 @@ static void
 openssldsa_destroy(dst_key_t *key) {
 	DSA *dsa = key->opaque;
 	DSA_free(dsa);
+	key->opaque = NULL;
 }
 
 
diff --git a/lib/dns/sec/dst/openssldh_link.c b/lib/dns/sec/dst/openssldh_link.c
index c4ff81c67c..7f0c639e69 100644
--- a/lib/dns/sec/dst/openssldh_link.c
+++ b/lib/dns/sec/dst/openssldh_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.29 2000/08/10 22:28:34 bwelling Exp $
+ * $Id: openssldh_link.c,v 1.30 2000/08/16 00:30:56 bwelling Exp $
  */
 
 #if defined(OPENSSL)
@@ -194,6 +194,7 @@ openssldh_destroy(dst_key_t *key) {
 	if (dh->g == &bn2)
 		dh->g = NULL;
 	DH_free(dh);
+	key->opaque = NULL;
 }
 
 static void