mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4561 from haydenroche5/wc_prf_fix

Browse Source
This commit is contained in:
John Safranek 2021-11-11 13:03:58 -08:00 committed by GitHub
commit c702dab988
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/kdf.c
View File

@ -131,11 +131,17 @@ int wc_PRF(byte* result, word32 resLen, const byte* secret,
#ifndef NO_SHA #ifndef NO_SHA
case sha_mac: case sha_mac:
default:
hash = WC_SHA; hash = WC_SHA;
len = WC_SHA_DIGEST_SIZE; len = WC_SHA_DIGEST_SIZE;
break; break;
#endif #endif
default:
#ifdef WOLFSSL_SMALL_STACK
if (previous) XFREE(previous, heap, DYNAMIC_TYPE_DIGEST);
if (current) XFREE(current, heap, DYNAMIC_TYPE_DIGEST);
if (hmac) XFREE(hmac, heap, DYNAMIC_TYPE_HMAC);
#endif
return HASH_TYPE_E;
} }
times = resLen / len; times = resLen / len;
@ -322,13 +328,16 @@ int wc_PRF_TLS(byte* digest, word32 digLen, const byte* secret, word32 secLen,
FREE_VAR(labelSeed, heap); FREE_VAR(labelSeed, heap);
#endif #endif
} }
#ifndef NO_OLD_TLS
else { else {
#ifndef NO_OLD_TLS
/* compute TLSv1 PRF (pseudo random function using HMAC) */ /* compute TLSv1 PRF (pseudo random function using HMAC) */
ret = wc_PRF_TLSv1(digest, digLen, secret, secLen, label, labLen, seed, ret = wc_PRF_TLSv1(digest, digLen, secret, secLen, label, labLen, seed,
seedLen, heap, devId); seedLen, heap, devId);
} #else
ret = BAD_FUNC_ARG;
#endif #endif
}
return ret; return ret;
} }