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

avoid callback buffer overwrite with sha512_224 and remove min from wolfcaam_cmac

Browse Source
This commit is contained in:
JacobBarthelmeh
2023-04-11 09:06:39 -07:00
parent 6a89464176
commit edad8d1da8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/port/caam/wolfcaam_cmac.c
View File

@ -99,7 +99,8 @@ int wc_CAAM_Cmac(Cmac* cmac, const byte* key, word32 keySz, const byte* in,
WOLFSSL_MSG("Error with CMAC buffer size"); WOLFSSL_MSG("Error with CMAC buffer size");
return -1; return -1;
} }
add = min(sz, (int)(AES_BLOCK_SIZE - cmac->bufferSz)); add = (sz < ((int)(AES_BLOCK_SIZE - cmac->bufferSz))) ? sz :
(int)(AES_BLOCK_SIZE - cmac->bufferSz);
XMEMCPY(&cmac->buffer[cmac->bufferSz], pt, add); XMEMCPY(&cmac->buffer[cmac->bufferSz], pt, add);
cmac->bufferSz += add; cmac->bufferSz += add;

7
wolfcrypt/src/sha512.c
View File

@ -1110,9 +1110,12 @@ static int Sha512_Family_Final(wc_Sha512* sha512, byte* hash, int digestSz,
#ifdef WOLF_CRYPTO_CB #ifdef WOLF_CRYPTO_CB
if (sha512->devId != INVALID_DEVID) { if (sha512->devId != INVALID_DEVID) {
ret = wc_CryptoCb_Sha512Hash(sha512, NULL, 0, hash); byte localHash[WC_SHA512_DIGEST_SIZE];
if (ret != CRYPTOCB_UNAVAILABLE) ret = wc_CryptoCb_Sha512Hash(sha512, NULL, 0, localHash);
if (ret != CRYPTOCB_UNAVAILABLE) {
XMEMCPY(hash, localHash, digestSz);
return ret; return ret;
}
/* fall-through when unavailable */ /* fall-through when unavailable */
} }
#endif #endif