From 81731df72f51b2d495d9a4e008b1566606e0169e Mon Sep 17 00:00:00 2001
From: Sean Parkinson <sparkinson@secure-crypto.org>
Date: Tue, 14 Mar 2017 09:47:34 +1000
Subject: [PATCH] Fix valgrind issues

Test program was re-using RSA and ECC key with multiple imports ops.
wc_RsaPublicKeyDecode() leaked if n parseable but not e.
---
 wolfcrypt/src/asn.c   |  6 ++++--
 wolfcrypt/test/test.c | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 94e01aac1..6ed0f6987 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -2220,8 +2220,10 @@ int wc_RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
     }
 #endif /* OPENSSL_EXTRA */
 
-    if (GetInt(&key->n,  input, inOutIdx, inSz) < 0 ||
-        GetInt(&key->e,  input, inOutIdx, inSz) < 0) {
+    if (GetInt(&key->n,  input, inOutIdx, inSz) < 0)
+        return ASN_RSA_KEY_E;
+    if (GetInt(&key->e,  input, inOutIdx, inSz) < 0) {
+        mp_clear(&key->n);
         return ASN_RSA_KEY_E;
     }
 
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index ffbd6b552..bcb4f6620 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -5879,11 +5879,19 @@ static int rsa_decode_test(void)
         ret = -525;
         goto done;
     }
+    wc_FreeRsaKey(&keyPub);
+    ret = wc_InitRsaKey(&keyPub, NULL);
+    if (ret != 0)
+        return -520;
     ret = wc_RsaPublicKeyDecodeRaw(n, sizeof(n), e, -1, &keyPub);
     if (ret != 0) {
         ret = -526;
         goto done;
     }
+    wc_FreeRsaKey(&keyPub);
+    ret = wc_InitRsaKey(&keyPub, NULL);
+    if (ret != 0)
+        return -520;
 
     /* Use API. */
     ret = wc_RsaPublicKeyDecodeRaw(n, sizeof(n), e, sizeof(e), &keyPub);
@@ -5891,6 +5899,10 @@ static int rsa_decode_test(void)
         ret = -527;
         goto done;
     }
+    wc_FreeRsaKey(&keyPub);
+    ret = wc_InitRsaKey(&keyPub, NULL);
+    if (ret != 0)
+        return -520;
 
     /* Parameter Validation testing. */
     inSz = sizeof(good);
@@ -5984,6 +5996,10 @@ static int rsa_decode_test(void)
         goto done;
     }
     /* TODO: Shouldn't ignore object id's data. */
+    wc_FreeRsaKey(&keyPub);
+    ret = wc_InitRsaKey(&keyPub, NULL);
+    if (ret != 0)
+        return -520;
 
     /* Valid data cases. */
     inSz = sizeof(good);
@@ -5997,6 +6013,10 @@ static int rsa_decode_test(void)
         ret = -551;
         goto done;
     }
+    wc_FreeRsaKey(&keyPub);
+    ret = wc_InitRsaKey(&keyPub, NULL);
+    if (ret != 0)
+        return -520;
 
     inSz = sizeof(goodAlgId);
     inOutIdx = 0;
@@ -6009,6 +6029,10 @@ static int rsa_decode_test(void)
         ret = -553;
         goto done;
     }
+    wc_FreeRsaKey(&keyPub);
+    ret = wc_InitRsaKey(&keyPub, NULL);
+    if (ret != 0)
+        return -520;
 
     inSz = sizeof(goodAlgIdNull);
     inOutIdx = 0;
@@ -6021,6 +6045,10 @@ static int rsa_decode_test(void)
         ret = -555;
         goto done;
     }
+    wc_FreeRsaKey(&keyPub);
+    ret = wc_InitRsaKey(&keyPub, NULL);
+    if (ret != 0)
+        return -520;
 
     inSz = sizeof(goodBitStrNoZero);
     inOutIdx = 0;
@@ -10239,6 +10267,9 @@ static int ecc_exp_imp_test(ecc_key* key)
         goto done;
     }
 
+    wc_ecc_free(&keyImp);
+    wc_ecc_init(&keyImp);
+
     ret = wc_ecc_import_raw_ex(&keyImp, qx, qy, d, ECC_SECP256R1);
     if (ret != 0) {
         ret = -1073;
@@ -12558,7 +12589,7 @@ int mp_test()
              *        - if p and a are even it will fail.
              */
             ret = mp_invmod(&a, &p, &r1);
-            if (ret != 0 && ret != FP_VAL)
+            if (ret != 0 && ret != MP_VAL)
                 return -11019;
             ret = 0;