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

fix AES-CCM tag size check on decryption

Browse Source
This commit is contained in:
Jacob Barthelmeh
2020-04-29 15:15:54 -06:00
parent b73e52f33f
commit 505fbed4df
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfcrypt/src/aes.c
View File

@@ -7305,10 +7305,7 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* sanity check on tag size */ /* sanity check on tag size */
if (authTagSz != 4 && authTagSz != 6 && authTagSz != 8 && if (wc_AesCcmCheckTagSize(authTagSz) != 0) {
authTagSz != 10 && authTagSz != 12 && authTagSz != 14 &&
authTagSz != 16) {
WOLFSSL_MSG("Bad auth tag size AES-CCM");
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }

4
wolfcrypt/src/port/arm/armv8-aes.c
View File

@@ -4510,6 +4510,10 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
|| authTag == NULL || nonceSz < 7 || nonceSz > 13) || authTag == NULL || nonceSz < 7 || nonceSz > 13)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (wc_AesCcmCheckTagSize(authTagSz) != 0) {
return BAD_FUNC_ARG;
}
o = out; o = out;
oSz = inSz; oSz = inSz;
XMEMCPY(B+1, nonce, nonceSz); XMEMCPY(B+1, nonce, nonceSz);

4
wolfcrypt/src/port/caam/caam_aes.c
View File

@@ -580,6 +580,10 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out,
authTagSz > AES_BLOCK_SIZE) authTagSz > AES_BLOCK_SIZE)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (wc_AesCcmCheckTagSize(authTagSz) != 0) {
return BAD_FUNC_ARG;
}
if (wc_AesGetKeySize(aes, &keySz) != 0) { if (wc_AesGetKeySize(aes, &keySz) != 0) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }