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

added parameter checking to Generate and Verify

Browse Source
This commit is contained in:
John Safranek
2016-05-29 13:46:27 -07:00
parent 746ae2f4e5
commit 0d031fcbd7
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wolfcrypt/src/cmac.c
View File

@ -165,10 +165,22 @@ int wc_AesCmacGenerate(byte* out, word32* outSz,
const byte* key, word32 keySz) const byte* key, word32 keySz)
{ {
Cmac cmac; Cmac cmac;
int ret;
wc_InitCmac(&cmac, key, keySz, WC_CMAC_AES, NULL); if (out == NULL || (in == NULL && inSz > 0) || key == NULL || keySz == 0)
wc_CmacUpdate(&cmac, in, inSz); return BAD_FUNC_ARG;
wc_CmacFinal(&cmac, out, outSz);
ret = wc_InitCmac(&cmac, key, keySz, WC_CMAC_AES, NULL);
if (ret != 0)
return ret;
ret = wc_CmacUpdate(&cmac, in, inSz);
if (ret != 0)
return ret;
ret = wc_CmacFinal(&cmac, out, outSz);
if (ret != 0)
return ret;
return 0; return 0;
} }
@ -183,6 +195,11 @@ int wc_AesCmacVerify(const byte* check, word32 checkSz,
int result; int result;
int compareRet; int compareRet;
if (check == NULL || checkSz == 0 || (in == NULL && inSz != 0) ||
key == NULL || keySz == 0)
return BAD_FUNC_ARG;
XMEMSET(a, 0, aSz); XMEMSET(a, 0, aSz);
result = wc_AesCmacGenerate(a, &aSz, in, inSz, key, keySz); result = wc_AesCmacGenerate(a, &aSz, in, inSz, key, keySz);
compareRet = ConstantCompare(check, a, min(checkSz, aSz)); compareRet = ConstantCompare(check, a, min(checkSz, aSz));