wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

comment on sz value and sanity check before fuzzing

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-06-20 09:21:56 -06:00
parent 83324f39d7
commit 61655ef56d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/internal.c
View File

@@ -11991,6 +11991,9 @@ int TimingPadVerify(WOLFSSL* ssl, const byte* input, int padLen, int macSz,
int ret = 0; int ret = 0;
good = MaskPadding(input, pLen, macSz); good = MaskPadding(input, pLen, macSz);
/* 4th 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. */
ret = ssl->hmac(ssl, verify, input, pLen - macSz - padLen - 1, padLen, ret = ssl->hmac(ssl, verify, input, pLen - macSz - padLen - 1, padLen,
content, 1); content, 1);
good |= MaskMac(input, pLen, ssl->specs.hash_size, verify); good |= MaskMac(input, pLen, ssl->specs.hash_size, verify);
@@ -12242,11 +12245,6 @@ static INLINE int VerifyMac(WOLFSSL* ssl, const byte* input, word32 msgSz,
padByte = 1; padByte = 1;
if (ssl->options.tls) { if (ssl->options.tls) {
/* Sanity check for underflow, TimingPadVerify performs hash on size
* (msgSz - ivExtra) - digestSz - pad - 1 */
if (digestSz + pad + 1 > (msgSz - ivExtra)) {
return BUFFER_E;
}
ret = TimingPadVerify(ssl, input, pad, digestSz, msgSz - ivExtra, ret = TimingPadVerify(ssl, input, pad, digestSz, msgSz - ivExtra,
content); content);
if (ret != 0) if (ret != 0)
@@ -13034,7 +13032,7 @@ static int SSL_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz,
(void)padLen; (void)padLen;
#ifdef HAVE_FUZZER #ifdef HAVE_FUZZER
if (ssl->fuzzerCb) if (ssl->fuzzerCb && (int)sz > 0)
ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx); ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx);
#endif #endif

5
src/tls.c
View File

@@ -1300,7 +1300,10 @@ int TLS_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz, int padSz,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef HAVE_FUZZER #ifdef HAVE_FUZZER
if (ssl->fuzzerCb) /* 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); ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx);
#endif #endif