From 2f5520d14c17d1b6bdb73ee70cfe67681f9d6d4c Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Wed, 1 Oct 2014 11:15:36 -0700
Subject: [PATCH] fix potential resource leaks with scr and normal math on key
 reuse

---
 src/internal.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/internal.c b/src/internal.c
index 243d52af7..2addac837 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -4214,7 +4214,15 @@ static int DoCertificate(CYASSL* ssl, byte* input, word32* inOutIdx,
             case RSAk:
                 {
                     word32 idx = 0;
-                    if (RsaPublicKeyDecode(dCert.publicKey, &idx,
+                    int    keyRet = 0;
+
+                    if (ssl->peerRsaKeyPresent) {  /* don't leak on reuse */
+                        FreeRsaKey(ssl->peerRsaKey);
+                        ssl->peerRsaKeyPresent = 0;
+                        keyRet = InitRsaKey(ssl->peerRsaKey, ssl->heap);
+                    }
+
+                    if (keyRet != 0 || RsaPublicKeyDecode(dCert.publicKey, &idx,
                                       ssl->peerRsaKey, dCert.pubKeySize) != 0) {
                         ret = PEER_KEY_ERROR;
                     }
@@ -4256,6 +4264,11 @@ static int DoCertificate(CYASSL* ssl, byte* input, word32* inOutIdx,
         #ifdef HAVE_ECC
             case ECDSAk:
                 {
+                    if (ssl->peerEccDsaKeyPresent) {  /* don't leak on reuse */
+                        ecc_free(ssl->peerEccDsaKey);
+                        ssl->peerEccDsaKeyPresent = 0;
+                        ecc_init(ssl->peerEccDsaKey);
+                    }
                     if (ecc_import_x963(dCert.publicKey, dCert.pubKeySize,
                                         ssl->peerEccDsaKey) != 0) {
                         ret = PEER_KEY_ERROR;
@@ -9336,6 +9349,12 @@ static void PickHashSigAlgo(CYASSL* ssl,
         if ((*inOutIdx - begin) + length > size)
             return BUFFER_ERROR;
 
+        if (ssl->peerEccKeyPresent) {  /* don't leak on reuse */
+            ecc_free(ssl->peerEccKey);
+            ssl->peerEccKeyPresent = 0;
+            ecc_init(ssl->peerEccKey);
+        }
+
         if (ecc_import_x963(input + *inOutIdx, length, ssl->peerEccKey) != 0)
             return ECC_PEERKEY_ERROR;
 
@@ -12408,6 +12427,12 @@ static void PickHashSigAlgo(CYASSL* ssl,
                 if ((*inOutIdx - begin) + length > size)
                     return BUFFER_ERROR;
 
+                if (ssl->peerEccKeyPresent) {  /* don't leak on reuse */
+                    ecc_free(ssl->peerEccKey);
+                    ssl->peerEccKeyPresent = 0;
+                    ecc_init(ssl->peerEccKey);
+                }
+
                 if (ecc_import_x963(input + *inOutIdx, length, ssl->peerEccKey))
                     return ECC_PEERKEY_ERROR;