From 24946d08b7496cf4dd126354ad0dbb768a8de446 Mon Sep 17 00:00:00 2001
From: Steffen Jaeckel <s@jaeckel.eu>
Date: Wed, 28 Jun 2017 14:19:12 +0200
Subject: [PATCH] use mp_cleanup_multi()

---
 src/pk/dh/dh_free.c   | 17 +----------------
 src/pk/dsa/dsa_free.c |  3 ++-
 src/pk/rsa/rsa_free.c |  2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/pk/dh/dh_free.c b/src/pk/dh/dh_free.c
index 8ca1f65..965ff24 100644
--- a/src/pk/dh/dh_free.c
+++ b/src/pk/dh/dh_free.c
@@ -18,22 +18,7 @@
 void dh_free(dh_key *key)
 {
    LTC_ARGCHKVD(key != NULL);
-   if ( key->base ) {
-      mp_clear( key->base );
-      key->base = NULL;
-   }
-   if ( key->prime ) {
-      mp_clear( key->prime );
-      key->prime = NULL;
-   }
-   if ( key->x ) {
-      mp_clear( key->x );
-      key->x = NULL;
-   }
-   if ( key->y ) {
-      mp_clear( key->y );
-      key->y = NULL;
-   }
+   mp_cleanup_multi(&key->base, &key->prime, &key->x, &key->y, NULL);
 }
 
 #endif /* LTC_MDH */
diff --git a/src/pk/dsa/dsa_free.c b/src/pk/dsa/dsa_free.c
index 89b5c66..812464e 100644
--- a/src/pk/dsa/dsa_free.c
+++ b/src/pk/dsa/dsa_free.c
@@ -22,7 +22,8 @@
 void dsa_free(dsa_key *key)
 {
    LTC_ARGCHKVD(key != NULL);
-   mp_clear_multi(key->g, key->q, key->p, key->x, key->y, NULL);
+   mp_cleanup_multi(&key->g, &key->q, &key->p, &key->x, &key->y, NULL);
+   key->type = key->qord = 0;
 }
 
 #endif
diff --git a/src/pk/rsa/rsa_free.c b/src/pk/rsa/rsa_free.c
index 48039e4..1e62f09 100644
--- a/src/pk/rsa/rsa_free.c
+++ b/src/pk/rsa/rsa_free.c
@@ -22,7 +22,7 @@
 void rsa_free(rsa_key *key)
 {
    LTC_ARGCHKVD(key != NULL);
-   mp_clear_multi(key->q, key->p, key->qP, key->dP, key->dQ, key->N, key->d, key->e, NULL);
+   mp_cleanup_multi(&key->q, &key->p, &key->qP, &key->dP, &key->dQ, &key->N, &key->d, &key->e, NULL);
 }
 
 #endif