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

Merge pull request #459 from ejohnstown/aes-cmac-fixes

Browse Source 
AES-CMAC Fixes
This commit is contained in:
JacobBarthelmeh
2016-06-23 22:10:26 -06:00
committed by GitHub
parent 746ae2f4e5 ffb537c33f
commit 379af941a8
2 changed files with 22 additions and 5 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));

4
wolfcrypt/test/test.c
View File

@ -2906,7 +2906,7 @@ int aes_test(void)
} }
#endif /* WOLFSSL_AES_COUNTER */ #endif /* WOLFSSL_AES_COUNTER */
#if defined(WOLFSSL_AESNI) && defined(WOLFSSL_AES_DIRECT) #ifdef WOLFSSL_AES_DIRECT
{ {
const byte niPlain[] = const byte niPlain[] =
{ {
@ -2944,7 +2944,7 @@ int aes_test(void)
if (XMEMCMP(plain, niPlain, AES_BLOCK_SIZE) != 0) if (XMEMCMP(plain, niPlain, AES_BLOCK_SIZE) != 0)
return -20007; return -20007;
} }
#endif /* WOLFSSL_AESNI && WOLFSSL_AES_DIRECT */ #endif /* WOLFSSL_AES_DIRECT */
return ret; return ret;
} }