mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-07-30 10:47:28 +02:00
Merge pull request #7783 from douzzer/20240723-AesGcmXcrypt-NULL-in-checks
20240723-AesGcmXcrypt-NULL-in-checks
This commit is contained in:
@ -8308,7 +8308,10 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* argument checks */
|
/* argument checks */
|
||||||
if (aes == NULL || authTagSz > AES_BLOCK_SIZE || ivSz == 0) {
|
if (aes == NULL || authTagSz > AES_BLOCK_SIZE || ivSz == 0 ||
|
||||||
|
((authTagSz > 0) && (authTag == NULL)) ||
|
||||||
|
((authInSz > 0) && (authIn == NULL)))
|
||||||
|
{
|
||||||
return BAD_FUNC_ARG;
|
return BAD_FUNC_ARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -8437,8 +8440,8 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
|
|||||||
* in and out are don't cares, as this is is the GMAC case. */
|
* in and out are don't cares, as this is is the GMAC case. */
|
||||||
if (aes == NULL || iv == NULL || (sz != 0 && (in == NULL || out == NULL)) ||
|
if (aes == NULL || iv == NULL || (sz != 0 && (in == NULL || out == NULL)) ||
|
||||||
authTag == NULL || authTagSz > AES_BLOCK_SIZE || authTagSz == 0 ||
|
authTag == NULL || authTagSz > AES_BLOCK_SIZE || authTagSz == 0 ||
|
||||||
ivSz == 0) {
|
ivSz == 0 || ((authInSz > 0) && (authIn == NULL)))
|
||||||
|
{
|
||||||
return BAD_FUNC_ARG;
|
return BAD_FUNC_ARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user