feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Peer review feedback. Improvements with small stack.

Browse Source
This commit is contained in:
David Garske
2021-10-11 11:01:03 -07:00
parent 0c1d12c224
commit 90a51490a9
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wolfcrypt/src/ecc.c
View File

@@ -4617,7 +4617,8 @@ int wc_ecc_make_key_ex2(WC_RNG* rng, int keysize, ecc_key* key, int curve_id,
int err; int err;
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) && \ #if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) && \
!defined(WOLFSSL_CRYPTOCELL) && !defined(WOLFSSL_KCAPI_ECC) !defined(WOLFSSL_CRYPTOCELL) && !defined(WOLFSSL_KCAPI_ECC) && \
!defined(WOLFSSL_SE050)
#if !defined(WOLFSSL_SP_MATH) #if !defined(WOLFSSL_SP_MATH)
DECLARE_CURVE_SPECS(curve, ECC_CURVE_FIELD_COUNT); DECLARE_CURVE_SPECS(curve, ECC_CURVE_FIELD_COUNT);
#endif #endif
@@ -6975,7 +6976,11 @@ int wc_ecc_verify_hash_ex(mp_int *r, mp_int *s, const byte* hash,
#elif defined(WOLFSSL_KCAPI_ECC) #elif defined(WOLFSSL_KCAPI_ECC)
byte sigRS[MAX_ECC_BYTES*2]; byte sigRS[MAX_ECC_BYTES*2];
#elif defined(WOLFSSL_SE050) #elif defined(WOLFSSL_SE050)
#ifdef WOLFSSL_SMALL_STACK
byte* sigRS = NULL;
#else
byte sigRS[ECC_MAX_CRYPTO_HW_SIZE * 2]; byte sigRS[ECC_MAX_CRYPTO_HW_SIZE * 2];
#endif
#elif !defined(WOLFSSL_SP_MATH) || defined(FREESCALE_LTC_ECC) #elif !defined(WOLFSSL_SP_MATH) || defined(FREESCALE_LTC_ECC)
int did_init = 0; int did_init = 0;
ecc_point *mG = NULL, *mQ = NULL; ecc_point *mG = NULL, *mQ = NULL;
@@ -7129,11 +7134,29 @@ int wc_ecc_verify_hash_ex(mp_int *r, mp_int *s, const byte* hash,
word32 signatureLen = rLeadingZero + sLeadingZero + word32 signatureLen = rLeadingZero + sLeadingZero +
rLen + sLen + SIG_HEADER_SZ; /* see StoreECC_DSA_Sig */ rLen + sLen + SIG_HEADER_SZ; /* see StoreECC_DSA_Sig */
#ifdef WOLFSSL_SMALL_STACK
sigRS = (byte*)XMALLOC(signatureLen, NULL, DYNAMIC_TYPE_SIGNATURE);
if (sigRS == NULL) {
err = MEMORY_E;
}
#else
if (signatureLen > sizeof(sigRS)) {
err = BUFFER_E;
}
#endif
if (err == 0) {
err = StoreECC_DSA_Sig(sigRS, &signatureLen, r, s); err = StoreECC_DSA_Sig(sigRS, &signatureLen, r, s);
}
if (err == 0) { if (err == 0) {
err = se050_ecc_verify_hash_ex(hash, hashlen, sigRS, err = se050_ecc_verify_hash_ex(hash, hashlen, sigRS,
signatureLen, key, res); signatureLen, key, res);
} }
#ifdef WOLFSSL_SMALL_STACK
if (sigRS != NULL) {
XFREE(sigRS, NULL, DYNAMIC_TYPE_SIGNATURE);
sigRS = NULL;
}
#endif
if (err != 0) if (err != 0)
return err; return err;
} }

2
wolfcrypt/src/sha512.c
View File

@@ -208,7 +208,6 @@
{ {
if (sha512 == NULL) if (sha512 == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
//void* heap;
return se050_hash_init(&sha512->se050Ctx, NULL); return se050_hash_init(&sha512->se050Ctx, NULL);
} }
int wc_InitSha512_ex(wc_Sha512* sha512, void* heap, int devId) int wc_InitSha512_ex(wc_Sha512* sha512, void* heap, int devId)
@@ -222,7 +221,6 @@
int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len) int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len)
{ {
return se050_hash_update(&sha512->se050Ctx, data, len); return se050_hash_update(&sha512->se050Ctx, data, len);
} }
int wc_Sha512Final(wc_Sha512* sha512, byte* hash) int wc_Sha512Final(wc_Sha512* sha512, byte* hash)
{ {