# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1425223628 -28800
# Node ID a64ef3c2b37148e9057ff0ae6d40ec7e35e25af7
# Parent  4c733310c21dc41b95b023a6c6f60134f2ae87cd# Parent  063c38ea622be3c51209fbe9c3cf3078ea72ea42
merge

diff -r 4c733310c21d -r a64ef3c2b371 ecc.c
--- a/ecc.c	Sun Mar 01 23:26:42 2015 +0800
+++ b/ecc.c	Sun Mar 01 23:27:08 2015 +0800
@@ -86,11 +86,6 @@
 {
 	mp_int *prime, *b, *t1, *t2;
 	int err;
-
-	prime = m_malloc(sizeof(mp_int));
-	b = m_malloc(sizeof(mp_int));
-	t1 = m_malloc(sizeof(mp_int));
-	t2 = m_malloc(sizeof(mp_int));
 	
 	m_mp_alloc_init_multi(&prime, &b, &t1, &t2, NULL);
 	
diff -r 4c733310c21d -r a64ef3c2b371 ecdsa.c
--- a/ecdsa.c	Sun Mar 01 23:26:42 2015 +0800
+++ b/ecdsa.c	Sun Mar 01 23:27:08 2015 +0800
@@ -409,7 +409,7 @@
 out:
 	ltc_ecc_del_point(mG);
 	ltc_ecc_del_point(mQ);
-	mp_clear_multi(r, s, v, w, u1, u2, p, e, m, NULL);
+	ltc_deinit_multi(r, s, v, w, u1, u2, p, e, m, NULL);
 	if (mp != NULL) { 
 		ltc_mp.montgomery_deinit(mp);
 	}
diff -r 4c733310c21d -r a64ef3c2b371 signkey.c
--- a/signkey.c	Sun Mar 01 23:26:42 2015 +0800
+++ b/signkey.c	Sun Mar 01 23:27:08 2015 +0800
@@ -187,6 +187,7 @@
 		if (eck) {
 			if (*eck) {
 				ecc_free(*eck);
+				m_free(*eck);
 				*eck = NULL;
 			}
 			*eck = buf_get_ecdsa_pub_key(buf);
@@ -255,6 +256,7 @@
 		if (eck) {
 			if (*eck) {
 				ecc_free(*eck);
+				m_free(*eck);
 				*eck = NULL;
 			}
 			*eck = buf_get_ecdsa_priv_key(buf);
@@ -355,18 +357,21 @@
 #ifdef DROPBEAR_ECC_256
 	if (key->ecckey256) {
 		ecc_free(key->ecckey256);
+		m_free(key->ecckey256);
 		key->ecckey256 = NULL;
 	}
 #endif
 #ifdef DROPBEAR_ECC_384
 	if (key->ecckey384) {
 		ecc_free(key->ecckey384);
+		m_free(key->ecckey384);
 		key->ecckey384 = NULL;
 	}
 #endif
 #ifdef DROPBEAR_ECC_521
 	if (key->ecckey521) {
 		ecc_free(key->ecckey521);
+		m_free(key->ecckey521);
 		key->ecckey521 = NULL;
 	}
 #endif