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

update SHA names with mcapi build

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-02-19 09:29:21 -07:00
parent 165059226e
commit a2d96bad49
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mcapi/crypto.c
View File

@ -105,7 +105,7 @@ int CRYPT_SHA_Initialize(CRYPT_SHA_CTX* sha)
if (sha == NULL) if (sha == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_InitSha((Sha*)sha); return wc_InitSha((wc_Sha*)sha);
} }
int CRYPT_SHA_DataSizeSet(CRYPT_SHA_CTX* sha, unsigned int sz) int CRYPT_SHA_DataSizeSet(CRYPT_SHA_CTX* sha, unsigned int sz)
@ -114,7 +114,7 @@ int CRYPT_SHA_DataSizeSet(CRYPT_SHA_CTX* sha, unsigned int sz)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef WOLFSSL_PIC32MZ_HASH #ifdef WOLFSSL_PIC32MZ_HASH
wc_ShaSizeSet((Sha*)sha, sz); wc_ShaSizeSet((wc_Sha*)sha, sz);
#else #else
(void)sz; (void)sz;
#endif #endif
@ -129,7 +129,7 @@ int CRYPT_SHA_DataAdd(CRYPT_SHA_CTX* sha, const unsigned char* input,
if (sha == NULL || input == NULL) if (sha == NULL || input == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_ShaUpdate((Sha*)sha, input, sz); return wc_ShaUpdate((wc_Sha*)sha, input, sz);
} }
@ -139,7 +139,7 @@ int CRYPT_SHA_Finalize(CRYPT_SHA_CTX* sha, unsigned char* digest)
if (sha == NULL || digest == NULL) if (sha == NULL || digest == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_ShaFinal((Sha*)sha, digest); return wc_ShaFinal((wc_Sha*)sha, digest);
} }
#endif #endif
@ -148,13 +148,13 @@ int CRYPT_SHA_Finalize(CRYPT_SHA_CTX* sha, unsigned char* digest)
/* Initialize SHA-256 */ /* Initialize SHA-256 */
int CRYPT_SHA256_Initialize(CRYPT_SHA256_CTX* sha256) int CRYPT_SHA256_Initialize(CRYPT_SHA256_CTX* sha256)
{ {
typedef char sha_test[sizeof(CRYPT_SHA256_CTX) >= sizeof(Sha256) ? 1 : -1]; typedef char sha_test[sizeof(CRYPT_SHA256_CTX) >= sizeof(wc_Sha256) ? 1 : -1];
(void)sizeof(sha_test); (void)sizeof(sha_test);
if (sha256 == NULL) if (sha256 == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_InitSha256((Sha256*)sha256); return wc_InitSha256((wc_Sha256*)sha256);
} }
int CRYPT_SHA256_DataSizeSet(CRYPT_SHA256_CTX* sha256, unsigned int sz) int CRYPT_SHA256_DataSizeSet(CRYPT_SHA256_CTX* sha256, unsigned int sz)
@ -163,7 +163,7 @@ int CRYPT_SHA256_DataSizeSet(CRYPT_SHA256_CTX* sha256, unsigned int sz)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef WOLFSSL_PIC32MZ_HASH #ifdef WOLFSSL_PIC32MZ_HASH
wc_Sha256SizeSet((Sha256*)sha256, sz); wc_Sha256SizeSet((wc_Sha256*)sha256, sz);
#else #else
(void)sz; (void)sz;
#endif #endif
@ -178,7 +178,7 @@ int CRYPT_SHA256_DataAdd(CRYPT_SHA256_CTX* sha256, const unsigned char* input,
if (sha256 == NULL || input == NULL) if (sha256 == NULL || input == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_Sha256Update((Sha256*)sha256, input, sz); return wc_Sha256Update((wc_Sha256*)sha256, input, sz);
} }
@ -188,7 +188,7 @@ int CRYPT_SHA256_Finalize(CRYPT_SHA256_CTX* sha256, unsigned char* digest)
if (sha256 == NULL || digest == NULL) if (sha256 == NULL || digest == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_Sha256Final((Sha256*)sha256, digest); return wc_Sha256Final((wc_Sha256*)sha256, digest);
} }
#endif #endif
@ -197,13 +197,13 @@ int CRYPT_SHA256_Finalize(CRYPT_SHA256_CTX* sha256, unsigned char* digest)
/* Initialize SHA-384 */ /* Initialize SHA-384 */
int CRYPT_SHA384_Initialize(CRYPT_SHA384_CTX* sha384) int CRYPT_SHA384_Initialize(CRYPT_SHA384_CTX* sha384)
{ {
typedef char sha_test[sizeof(CRYPT_SHA384_CTX) >= sizeof(Sha384) ? 1 : -1]; typedef char sha_test[sizeof(CRYPT_SHA384_CTX) >= sizeof(wc_Sha384) ? 1 : -1];
(void)sizeof(sha_test); (void)sizeof(sha_test);
if (sha384 == NULL) if (sha384 == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_InitSha384((Sha384*)sha384); return wc_InitSha384((wc_Sha384*)sha384);
} }
@ -214,7 +214,7 @@ int CRYPT_SHA384_DataAdd(CRYPT_SHA384_CTX* sha384, const unsigned char* input,
if (sha384 == NULL || input == NULL) if (sha384 == NULL || input == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_Sha384Update((Sha384*)sha384, input, sz); return wc_Sha384Update((wc_Sha384*)sha384, input, sz);
} }
@ -224,7 +224,7 @@ int CRYPT_SHA384_Finalize(CRYPT_SHA384_CTX* sha384, unsigned char* digest)
if (sha384 == NULL || digest == NULL) if (sha384 == NULL || digest == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_Sha384Final((Sha384*)sha384, digest); return wc_Sha384Final((wc_Sha384*)sha384, digest);
} }
#endif #endif
@ -232,13 +232,13 @@ int CRYPT_SHA384_Finalize(CRYPT_SHA384_CTX* sha384, unsigned char* digest)
/* Initialize SHA-512 */ /* Initialize SHA-512 */
int CRYPT_SHA512_Initialize(CRYPT_SHA512_CTX* sha512) int CRYPT_SHA512_Initialize(CRYPT_SHA512_CTX* sha512)
{ {
typedef char sha_test[sizeof(CRYPT_SHA512_CTX) >= sizeof(Sha512) ? 1 : -1]; typedef char sha_test[sizeof(CRYPT_SHA512_CTX) >= sizeof(wc_Sha512) ? 1 : -1];
(void)sizeof(sha_test); (void)sizeof(sha_test);
if (sha512 == NULL) if (sha512 == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_InitSha512((Sha512*)sha512); return wc_InitSha512((wc_Sha512*)sha512);
} }
@ -249,7 +249,7 @@ int CRYPT_SHA512_DataAdd(CRYPT_SHA512_CTX* sha512, const unsigned char* input,
if (sha512 == NULL || input == NULL) if (sha512 == NULL || input == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_Sha512Update((Sha512*)sha512, input, sz); return wc_Sha512Update((wc_Sha512*)sha512, input, sz);
} }
@ -259,7 +259,7 @@ int CRYPT_SHA512_Finalize(CRYPT_SHA512_CTX* sha512, unsigned char* digest)
if (sha512 == NULL || digest == NULL) if (sha512 == NULL || digest == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return wc_Sha512Final((Sha512*)sha512, digest); return wc_Sha512Final((wc_Sha512*)sha512, digest);
} }
#endif #endif

22
mcapi/mcapi_test.c
View File

@ -279,10 +279,10 @@ static int check_sha(void)
static int check_sha256(void) static int check_sha256(void)
{ {
CRYPT_SHA256_CTX mcSha256; CRYPT_SHA256_CTX mcSha256;
Sha256 defSha256; wc_Sha256 defSha256;
int ret; int ret;
byte mcDigest[CRYPT_SHA256_DIGEST_SIZE]; byte mcDigest[CRYPT_SHA256_DIGEST_SIZE];
byte defDigest[SHA256_DIGEST_SIZE]; byte defDigest[WC_SHA256_DIGEST_SIZE];
CRYPT_SHA256_Initialize(&mcSha256); CRYPT_SHA256_Initialize(&mcSha256);
ret = wc_InitSha256(&defSha256); ret = wc_InitSha256(&defSha256);
@ -319,10 +319,10 @@ static int check_sha256(void)
static int check_sha384(void) static int check_sha384(void)
{ {
CRYPT_SHA384_CTX mcSha384; CRYPT_SHA384_CTX mcSha384;
Sha384 defSha384; wc_Sha384 defSha384;
int ret; int ret;
byte mcDigest[CRYPT_SHA384_DIGEST_SIZE]; byte mcDigest[CRYPT_SHA384_DIGEST_SIZE];
byte defDigest[SHA384_DIGEST_SIZE]; byte defDigest[WC_SHA384_DIGEST_SIZE];
CRYPT_SHA384_Initialize(&mcSha384); CRYPT_SHA384_Initialize(&mcSha384);
ret = wc_InitSha384(&defSha384); ret = wc_InitSha384(&defSha384);
@ -359,10 +359,10 @@ static int check_sha384(void)
static int check_sha512(void) static int check_sha512(void)
{ {
CRYPT_SHA512_CTX mcSha512; CRYPT_SHA512_CTX mcSha512;
Sha512 defSha512; wc_Sha512 defSha512;
int ret; int ret;
byte mcDigest[CRYPT_SHA512_DIGEST_SIZE]; byte mcDigest[CRYPT_SHA512_DIGEST_SIZE];
byte defDigest[SHA512_DIGEST_SIZE]; byte defDigest[WC_SHA512_DIGEST_SIZE];
CRYPT_SHA512_Initialize(&mcSha512); CRYPT_SHA512_Initialize(&mcSha512);
ret = wc_InitSha512(&defSha512); ret = wc_InitSha512(&defSha512);
@ -402,13 +402,13 @@ static int check_hmac(void)
Hmac defHmac; Hmac defHmac;
int ret; int ret;
byte mcDigest[CRYPT_SHA512_DIGEST_SIZE]; byte mcDigest[CRYPT_SHA512_DIGEST_SIZE];
byte defDigest[SHA512_DIGEST_SIZE]; byte defDigest[WC_SHA512_DIGEST_SIZE];
strncpy((char*)key, "Jefe", 4); strncpy((char*)key, "Jefe", 4);
/* SHA1 */ /* SHA1 */
CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA, key, 4); CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA, key, 4);
ret = wc_HmacSetKey(&defHmac, SHA, key, 4); ret = wc_HmacSetKey(&defHmac, WC_SHA, key, 4);
if (ret != 0) { if (ret != 0) {
printf("hmac sha setkey default failed\n"); printf("hmac sha setkey default failed\n");
return -1; return -1;
@ -436,7 +436,7 @@ static int check_hmac(void)
/* SHA-256 */ /* SHA-256 */
CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA256, key, 4); CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA256, key, 4);
ret = wc_HmacSetKey(&defHmac, SHA256, key, 4); ret = wc_HmacSetKey(&defHmac, WC_SHA256, key, 4);
if (ret != 0) { if (ret != 0) {
printf("hmac sha256 setkey default failed\n"); printf("hmac sha256 setkey default failed\n");
return -1; return -1;
@ -464,7 +464,7 @@ static int check_hmac(void)
/* SHA-384 */ /* SHA-384 */
CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA384, key, 4); CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA384, key, 4);
ret = wc_HmacSetKey(&defHmac, SHA384, key, 4); ret = wc_HmacSetKey(&defHmac, WC_SHA384, key, 4);
if (ret != 0) { if (ret != 0) {
printf("hmac sha384 setkey default failed\n"); printf("hmac sha384 setkey default failed\n");
return -1; return -1;
@ -492,7 +492,7 @@ static int check_hmac(void)
/* SHA-512 */ /* SHA-512 */
CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA512, key, 4); CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA512, key, 4);
ret = wc_HmacSetKey(&defHmac, SHA512, key, 4); ret = wc_HmacSetKey(&defHmac, WC_SHA512, key, 4);
if (ret != 0) { if (ret != 0) {
printf("hmac sha512 setkey default failed\n"); printf("hmac sha512 setkey default failed\n");
return -1; return -1;