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

add AUTH_SZ size check to ti and armv8 ports

Browse Source
This commit is contained in:
toddouska
2017-03-03 11:42:24 -08:00
parent c1c7c90345
commit a348898e96
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2532,6 +2532,11 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (authTagSz < WOLFSSL_MIN_AUTH_TAG_SZ) {
WOLFSSL_MSG("GcmEncrypt authTagSz too small error");
return BAD_FUNC_ARG;
}
switch (aes->rounds) { switch (aes->rounds) {
case 10: case 10:
return Aes128GcmEncrypt(aes, out, in, sz, iv, ivSz, return Aes128GcmEncrypt(aes, out, in, sz, iv, ivSz,

3
wolfcrypt/src/port/ti/ti-aes.c
View File

@ -490,6 +490,9 @@ WOLFSSL_API int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz
byte* authTag, word32 authTagSz, byte* authTag, word32 authTagSz,
const byte* authIn, word32 authInSz) const byte* authIn, word32 authInSz)
{ {
if (authTagSz < WOLFSSL_MIN_AUTH_TAG_SZ) {
return BAD_FUNC_ARG;
}
return AesAuthEncrypt(aes, out, in, sz, iv, ivSz, authTag, authTagSz, return AesAuthEncrypt(aes, out, in, sz, iv, ivSz, authTag, authTagSz,
authIn, authInSz, AES_CFG_MODE_GCM_HY0CALC) ; authIn, authInSz, AES_CFG_MODE_GCM_HY0CALC) ;
} }