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

added parameter checks

Browse Source
This commit is contained in:
John Safranek
2016-05-24 11:21:06 -07:00
parent c0cbc97b06
commit dbfd5dffaf
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wolfcrypt/src/cmac.c
View File

@ -35,6 +35,7 @@
#include <wolfcrypt/src/misc.c> #include <wolfcrypt/src/misc.c>
#endif #endif
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/aes.h> #include <wolfssl/wolfcrypt/aes.h>
#include <wolfssl/wolfcrypt/cmac.h> #include <wolfssl/wolfcrypt/cmac.h>
@ -70,6 +71,7 @@ static void ShiftAndXorRb(byte* out, byte* in)
} }
#define AES 0
int wc_InitCmac(Cmac* cmac, const byte* key, word32 keySz, int wc_InitCmac(Cmac* cmac, const byte* key, word32 keySz,
int type, void* unused) int type, void* unused)
{ {
@ -77,7 +79,8 @@ int wc_InitCmac(Cmac* cmac, const byte* key, word32 keySz,
(void)unused; (void)unused;
if (type != 0) return -1; if (cmac == NULL || key == NULL || keySz == 0 || type != AES)
return BAD_FUNC_ARG;
XMEMSET(cmac, 0, sizeof(Cmac)); XMEMSET(cmac, 0, sizeof(Cmac));
ret = wc_AesSetKey(&cmac->aes, key, keySz, NULL, AES_ENCRYPTION); ret = wc_AesSetKey(&cmac->aes, key, keySz, NULL, AES_ENCRYPTION);
@ -96,6 +99,9 @@ int wc_InitCmac(Cmac* cmac, const byte* key, word32 keySz,
int wc_CmacUpdate(Cmac* cmac, const byte* in, word32 inSz) int wc_CmacUpdate(Cmac* cmac, const byte* in, word32 inSz)
{ {
if ((cmac == NULL) || (in == NULL && inSz != 0))
return BAD_FUNC_ARG;
while (inSz != 0) { while (inSz != 0) {
word32 add = min(inSz, AES_BLOCK_SIZE - cmac->bufferSz); word32 add = min(inSz, AES_BLOCK_SIZE - cmac->bufferSz);
XMEMCPY(&cmac->buffer[cmac->bufferSz], in, add); XMEMCPY(&cmac->buffer[cmac->bufferSz], in, add);
@ -123,7 +129,12 @@ int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz)
{ {
const byte* subKey; const byte* subKey;
(void)outSz; if (cmac == NULL || out == NULL)
return BAD_FUNC_ARG;
if (outSz != NULL && *outSz < AES_BLOCK_SIZE)
return BUFFER_E;
if (cmac->bufferSz == AES_BLOCK_SIZE) { if (cmac->bufferSz == AES_BLOCK_SIZE) {
subKey = cmac->k1; subKey = cmac->k1;
} }
@ -133,13 +144,17 @@ int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz)
if (remainder == 0) if (remainder == 0)
remainder = AES_BLOCK_SIZE; remainder = AES_BLOCK_SIZE;
XMEMSET(cmac->buffer + AES_BLOCK_SIZE - remainder, 0, remainder); if (remainder > 1)
XMEMSET(cmac->buffer + AES_BLOCK_SIZE - remainder, 0, remainder);
cmac->buffer[AES_BLOCK_SIZE - remainder] = 0x80; cmac->buffer[AES_BLOCK_SIZE - remainder] = 0x80;
subKey = cmac->k2; subKey = cmac->k2;
} }
xorbuf(cmac->buffer, cmac->digest, AES_BLOCK_SIZE); xorbuf(cmac->buffer, cmac->digest, AES_BLOCK_SIZE);
xorbuf(cmac->buffer, subKey, AES_BLOCK_SIZE); xorbuf(cmac->buffer, subKey, AES_BLOCK_SIZE);
wc_AesEncryptDirect(&cmac->aes, out, cmac->buffer); wc_AesEncryptDirect(&cmac->aes, out, cmac->buffer);
if (outSz != NULL)
*outSz = AES_BLOCK_SIZE;
ForceZero(cmac, sizeof(Cmac)); ForceZero(cmac, sizeof(Cmac));
return 0; return 0;