wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2791 from dgarske/async_fixes

Browse Source 
Fixes for asynchronous crypto issues
This commit is contained in:
toddouska
2020-02-17 11:43:13 -08:00
committed by GitHub
parent 14b7355411 f322b71526
commit f2e1266f2d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ssl.c
View File

@ -31772,7 +31772,7 @@ int wolfSSL_EVP_PKEY_set1_DH(WOLFSSL_EVP_PKEY *pkey, WOLFSSL_DH *key)
if (ret <= 0) { if (ret <= 0) {
WOLFSSL_MSG("Failed to export DH Key"); WOLFSSL_MSG("Failed to export DH Key");
XFREE(derBuf, key->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derBuf, pkey->heap, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -45054,6 +45054,7 @@ WOLFSSL_BIGNUM *wolfSSL_ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai,
ret = GetInt(&mpi, ai->data, &idx, ai->dataMax); ret = GetInt(&mpi, ai->data, &idx, ai->dataMax);
if (ret != 0) { if (ret != 0) {
#ifdef WOLFSSL_QT #ifdef WOLFSSL_QT
mp_init(&mpi); /* must init mpi */
/* Serial number in QT starts at index 0 of data */ /* Serial number in QT starts at index 0 of data */
if (mp_read_unsigned_bin(&mpi, (byte*)ai->data, ai->length) != 0) { if (mp_read_unsigned_bin(&mpi, (byte*)ai->data, ai->length) != 0) {
mp_clear(&mpi); mp_clear(&mpi);

4
wolfcrypt/src/ecc.c
View File

@ -4858,8 +4858,10 @@ int wc_ecc_sign_hash_ex(const byte* in, word32 inlen, WC_RNG* rng,
#else #else
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC) && \ #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC) && \
(defined(HAVE_CAVIUM_V) || defined(HAVE_INTEL_QA)) (defined(HAVE_CAVIUM_V) || defined(HAVE_INTEL_QA))
if (key->asyncDev.marker == WOLFSSL_ASYNC_MARKER_ECC) if (key->asyncDev.marker == WOLFSSL_ASYNC_MARKER_ECC) {
ALLOC_CURVE_SPECS(ECC_CURVE_FIELD_COUNT); ALLOC_CURVE_SPECS(ECC_CURVE_FIELD_COUNT);
err = wc_ecc_curve_load(key->dp, &curve, ECC_CURVE_FIELD_ALL);
}
else else
#endif #endif
{ {