From 1361e4dbef28734fe05803550b0dd7557d78bc64 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Mon, 4 Nov 2019 23:25:47 -0700
Subject: [PATCH] remove extra setting of ecc key size with CRYPTOCELL build

---
 wolfcrypt/src/ecc.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
index 509f8bbea..e91bdd8a7 100644
--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@@ -4037,20 +4037,12 @@ int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id)
     CRYS_ECPKI_KG_TempData_t    tempBuff;
     CRYS_ECPKI_KG_FipsContext_t fipsCtx;
     byte ucompressed_key[ECC_MAX_CRYPTO_HW_SIZE*2 + 1];
-    word32 raw_size;
+    word32 raw_size = 0;
 #endif
     if (key == NULL || rng == NULL) {
         return BAD_FUNC_ARG;
     }
 
-#if defined(WOLFSSL_CRYPTOCELL)
-    if (key->dp == NULL) {
-        WOLFSSL_MSG("ECC internal dp structure was NULL");
-        return BAD_FUNC_ARG;
-    }
-
-    raw_size = (word32) (key->dp->size)*2 + 1;
-#endif
     /* make sure required variables are reset */
     wc_ecc_reset(key);
 
@@ -7240,21 +7232,13 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
     const CRYS_ECPKI_Domain_t* pDomain;
     CRYS_ECPKI_BUILD_TempData_t tempBuff;
     byte key_raw[ECC_MAX_CRYPTO_HW_SIZE*2 + 1];
-    word32 keySz;
+    word32 keySz = 0;
 #endif
     /* if d is NULL, only import as public key using Qx,Qy */
     if (key == NULL || qx == NULL || qy == NULL) {
         return BAD_FUNC_ARG;
     }
 
-#if defined(WOLFSSL_CRYPTOCELL)
-    if (key->dp == NULL) {
-        WOLFSSL_MSG("ECC internal dp structure was NULL");
-        return BAD_FUNC_ARG;
-    }
-
-    keySz = (word32) (key->dp->size)*2 + 1;
-#endif
     /* make sure required variables are reset */
     wc_ecc_reset(key);