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

update size to be used with fuzzing

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-06-20 15:29:05 -06:00
parent 777c89a257
commit 2f43d5eece
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@ -11991,7 +11991,7 @@ int TimingPadVerify(WOLFSSL* ssl, const byte* input, int padLen, int macSz,
int ret = 0;
good = MaskPadding(input, pLen, macSz);
/* 4th argument has potential to underflow, all ssl->hmac functions need to
/* 4th argument has potential to underflow, ssl->hmac function should
* either increment the size by (macSz + padLen + 1) before use or check on
* the size to make sure is valid. */
ret = ssl->hmac(ssl, verify, input, pLen - macSz - padLen - 1, padLen,
@ -13032,7 +13032,7 @@ static int SSL_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz,
(void)padLen;
#ifdef HAVE_FUZZER
if (ssl->fuzzerCb && (int)sz > 0)
if (ssl->fuzzerCb)
ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx);
#endif

15
src/tls.c
View File

@ -1300,11 +1300,16 @@ int TLS_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz, int padSz,
return BAD_FUNC_ARG;
#ifdef HAVE_FUZZER
/* sz argument has potential to underflow, all ssl->hmac functions need to
* either increment the size by (macSz + padLen + 1) before use or check on
* the size to make sure is valid when sz is effected by IO */
if (ssl->fuzzerCb && (int)sz > 0)
ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx);
/* Fuzz "in" buffer with sz to be used in HMAC algorithm */
if (ssl->fuzzerCb) {
if (verify && padSz >= 0) {
ssl->fuzzerCb(ssl, in, sz + ssl->specs.hash_size + padSz + 1,
FUZZ_HMAC, ssl->fuzzerCtx);
}
else {
ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx);
}
}
#endif
wolfSSL_SetTlsHmacInner(ssl, myInner, sz, content, verify);