wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 20:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

use constant for Cmac type

Browse Source
This commit is contained in:
John Safranek
2016-05-24 16:46:04 -07:00
parent dbfd5dffaf
commit 9bf4598772
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/cmac.c
View File

@@ -71,7 +71,6 @@ 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)
{ {
@@ -79,7 +78,7 @@ int wc_InitCmac(Cmac* cmac, const byte* key, word32 keySz,
(void)unused; (void)unused;
if (cmac == NULL || key == NULL || keySz == 0 || type != AES) if (cmac == NULL || key == NULL || keySz == 0 || type != WC_CMAC_AES)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
XMEMSET(cmac, 0, sizeof(Cmac)); XMEMSET(cmac, 0, sizeof(Cmac));

28
wolfcrypt/test/test.c
View File

@@ -7746,20 +7746,20 @@ int cmac_test(void)
const CMAC_Test_Case testCases[] = const CMAC_Test_Case testCases[] =
{ {
{0, 0, m, MLEN_0, k128, KLEN_128, t128_0, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_0, k128, KLEN_128, t128_0, AES_BLOCK_SIZE},
{0, 0, m, MLEN_128, k128, KLEN_128, t128_128, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_128, k128, KLEN_128, t128_128, AES_BLOCK_SIZE},
{0, 0, m, MLEN_320, k128, KLEN_128, t128_320, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_320, k128, KLEN_128, t128_320, AES_BLOCK_SIZE},
{0, 0, m, MLEN_512, k128, KLEN_128, t128_512, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_512, k128, KLEN_128, t128_512, AES_BLOCK_SIZE},
{0, 5, m, MLEN_512, k128, KLEN_128, t128_512, AES_BLOCK_SIZE}, {WC_CMAC_AES, 5, m, MLEN_512, k128, KLEN_128, t128_512, AES_BLOCK_SIZE},
{0, 0, m, MLEN_0, k192, KLEN_192, t192_0, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_0, k192, KLEN_192, t192_0, AES_BLOCK_SIZE},
{0, 0, m, MLEN_128, k192, KLEN_192, t192_128, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_128, k192, KLEN_192, t192_128, AES_BLOCK_SIZE},
{0, 0, m, MLEN_320, k192, KLEN_192, t192_320, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_320, k192, KLEN_192, t192_320, AES_BLOCK_SIZE},
{0, 0, m, MLEN_512, k192, KLEN_192, t192_512, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_512, k192, KLEN_192, t192_512, AES_BLOCK_SIZE},
{0, 0, m, MLEN_0, k256, KLEN_256, t256_0, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_0, k256, KLEN_256, t256_0, AES_BLOCK_SIZE},
{0, 0, m, MLEN_128, k256, KLEN_256, t256_128, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_128, k256, KLEN_256, t256_128, AES_BLOCK_SIZE},
{0, 0, m, MLEN_320, k256, KLEN_256, t256_320, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_320, k256, KLEN_256, t256_320, AES_BLOCK_SIZE},
{0, 0, m, MLEN_512, k256, KLEN_256, t256_512, AES_BLOCK_SIZE}, {WC_CMAC_AES, 0, m, MLEN_512, k256, KLEN_256, t256_512, AES_BLOCK_SIZE},
{0, 0, m, MLEN_319, k128, KLEN_128, t128_319, AES_BLOCK_SIZE} {WC_CMAC_AES, 0, m, MLEN_319, k128, KLEN_128, t128_319, AES_BLOCK_SIZE}
}; };
Cmac cmac; Cmac cmac;

5
wolfssl/wolfcrypt/cmac.h
View File

@@ -43,6 +43,11 @@ typedef struct Cmac {
} Cmac; } Cmac;
typedef enum CmacType {
WC_CMAC_AES = 1
} CmacType;
WOLFSSL_API WOLFSSL_API
int wc_InitCmac(Cmac* cmac, int wc_InitCmac(Cmac* cmac,
const byte* key, word32 keySz, const byte* key, word32 keySz,