wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement peer review feedback

Browse Source
This commit is contained in:
kaleb-himes
2024-06-21 15:53:18 -04:00
parent a1645d684a
commit 871dc9c19b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wolfcrypt/src/aes.c
View File

@@ -10643,11 +10643,6 @@ static WARN_UNUSED_RESULT int roll_auth(
word32 remainder; word32 remainder;
int ret; int ret;
/* Sanity check on authIn to prevent segfault in xorbuf() where
* variable 'in' is dereferenced as the mask 'm' in misc.c */
if (in == NULL)
return BAD_FUNC_ARG;
/* encode the length in */ /* encode the length in */
if (inSz <= 0xFEFF) { if (inSz <= 0xFEFF) {
authLenSz = 2; authLenSz = 2;
@@ -10766,6 +10761,11 @@ int wc_AesCcmEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
authTagSz > AES_BLOCK_SIZE) authTagSz > AES_BLOCK_SIZE)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* Sanity check on authIn to prevent segfault in xorbuf() where
* variable 'in' is dereferenced as the mask 'm' in misc.c */
if (authIn == NULL && authInSz > 0)
return BAD_FUNC_ARG;
/* sanity check on tag size */ /* sanity check on tag size */
if (wc_AesCcmCheckTagSize((int)authTagSz) != 0) { if (wc_AesCcmCheckTagSize((int)authTagSz) != 0) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -10908,6 +10908,12 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
authTagSz > AES_BLOCK_SIZE) authTagSz > AES_BLOCK_SIZE)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* Sanity check on authIn to prevent segfault in xorbuf() where
* variable 'in' is dereferenced as the mask 'm' in misc.c */
if (authIn == NULL && authInSz > 0)
return BAD_FUNC_ARG;
/* sanity check on tag size */ /* sanity check on tag size */
if (wc_AesCcmCheckTagSize((int)authTagSz) != 0) { if (wc_AesCcmCheckTagSize((int)authTagSz) != 0) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;