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

Updated mcapi/mcapi_test.c ; wolfcrypt/src/md5.c ; wolfcrypt/src/pwdbased.c.

Browse Source
This commit is contained in:
jrblixt
2017-04-14 16:12:29 -06:00
parent 609ca3c823
commit 5b5c8f1e95
3 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
mcapi/mcapi_test.c
View File

@@ -220,26 +220,21 @@ static int check_md5(void)
CRYPT_MD5_Initialize(&mcMd5); CRYPT_MD5_Initialize(&mcMd5);
ret = wc_InitMd5(&defMd5); ret = wc_InitMd5(&defMd5);
if (ret != 0) {
return ret; if (ret == 0) {
CRYPT_MD5_DataAdd(&mcMd5, ourData, OUR_DATA_SIZE);
ret = wc_Md5Update(&defMd5, ourData, OUR_DATA_SIZE);
} }
CRYPT_MD5_DataAdd(&mcMd5, ourData, OUR_DATA_SIZE); if (ret == 0) {
ret = wc_Md5Update(&defMd5, ourData, OUR_DATA_SIZE); CRYPT_MD5_Finalize(&mcMd5, mcDigest);
if (ret != 0) { ret = wc_Md5Final(&defMd5, defDigest);
return ret;
}
CRYPT_MD5_Finalize(&mcMd5, mcDigest);
ret = wc_Md5Final(&defMd5, defDigest);
if (ret != 0) {
return ret;
} }
if (memcmp(mcDigest, defDigest, CRYPT_MD5_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_MD5_DIGEST_SIZE) != 0) {
printf("md5 final memcmp fialed\n"); printf("md5 final memcmp fialed\n");
return -1; return -1;
} }
printf("md5 mcapi test passed\n"); printf("md5 mcapi test passed\n");
return ret; return ret;
@@ -271,7 +266,7 @@ static int check_sha(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA_DIGEST_SIZE) != 0) {
printf("sha final memcmp failed\n"); printf("sha final memcmp failed\n");
return -1; return -1;
} }
printf("sha mcapi test passed\n"); printf("sha mcapi test passed\n");
return 0; return 0;
@@ -311,7 +306,7 @@ static int check_sha256(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA256_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA256_DIGEST_SIZE) != 0) {
printf("sha256 final memcmp fialed\n"); printf("sha256 final memcmp fialed\n");
return -1; return -1;
} }
printf("sha256 mcapi test passed\n"); printf("sha256 mcapi test passed\n");
return 0; return 0;
@@ -351,7 +346,7 @@ static int check_sha384(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA384_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA384_DIGEST_SIZE) != 0) {
printf("sha384 final memcmp fialed\n"); printf("sha384 final memcmp fialed\n");
return -1; return -1;
} }
printf("sha384 mcapi test passed\n"); printf("sha384 mcapi test passed\n");
return 0; return 0;
@@ -391,7 +386,7 @@ static int check_sha512(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA512_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA512_DIGEST_SIZE) != 0) {
printf("sha512 final memcmp fialed\n"); printf("sha512 final memcmp fialed\n");
return -1; return -1;
} }
printf("sha512 mcapi test passed\n"); printf("sha512 mcapi test passed\n");
return 0; return 0;
@@ -434,7 +429,7 @@ static int check_hmac(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA_DIGEST_SIZE) != 0) {
printf("hmac sha final memcmp fialed\n"); printf("hmac sha final memcmp fialed\n");
return -1; return -1;
} }
printf("hmac sha mcapi test passed\n"); printf("hmac sha mcapi test passed\n");
/* SHA-256 */ /* SHA-256 */
@@ -462,7 +457,7 @@ static int check_hmac(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA256_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA256_DIGEST_SIZE) != 0) {
printf("hmac sha256 final memcmp fialed\n"); printf("hmac sha256 final memcmp fialed\n");
return -1; return -1;
} }
printf("hmac sha256 mcapi test passed\n"); printf("hmac sha256 mcapi test passed\n");
/* SHA-384 */ /* SHA-384 */
@@ -490,7 +485,7 @@ static int check_hmac(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA384_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA384_DIGEST_SIZE) != 0) {
printf("hmac sha384 final memcmp fialed\n"); printf("hmac sha384 final memcmp fialed\n");
return -1; return -1;
} }
printf("hmac sha384 mcapi test passed\n"); printf("hmac sha384 mcapi test passed\n");
/* SHA-512 */ /* SHA-512 */
@@ -518,7 +513,7 @@ static int check_hmac(void)
if (memcmp(mcDigest, defDigest, CRYPT_SHA512_DIGEST_SIZE) != 0) { if (memcmp(mcDigest, defDigest, CRYPT_SHA512_DIGEST_SIZE) != 0) {
printf("hmac sha512 final memcmp fialed\n"); printf("hmac sha512 final memcmp fialed\n");
return -1; return -1;
} }
printf("hmac sha512 mcapi test passed\n"); printf("hmac sha512 mcapi test passed\n");
return 0; return 0;
@@ -631,7 +626,7 @@ static int check_compress(void)
static int check_rng(void) static int check_rng(void)
{ {
int ret; int ret;
int i; int i;
byte in[RANDOM_BYTE_SZ]; byte in[RANDOM_BYTE_SZ];
byte out[RANDOM_BYTE_SZ]; byte out[RANDOM_BYTE_SZ];
@@ -1336,7 +1331,7 @@ static int check_rsa(void)
return -1; return -1;
} }
ret = CRYPT_RSA_PrivateDecrypt(&mcRsa, out2, sizeof(out2), out1, ret); ret = CRYPT_RSA_PrivateDecrypt(&mcRsa, out2, sizeof(out2), out1, ret);
if (ret < 0) { if (ret < 0) {
printf("mcapi rsa private derypt failed\n"); printf("mcapi rsa private derypt failed\n");
return -1; return -1;
@@ -1358,7 +1353,7 @@ static int check_rsa(void)
printf("mcapi rsa free failed\n"); printf("mcapi rsa free failed\n");
return -1; return -1;
} }
printf("rsa mcapi test passed\n"); printf("rsa mcapi test passed\n");
return 0; return 0;
@@ -1368,7 +1363,7 @@ static int check_rsa(void)
/* check mcapi ecc */ /* check mcapi ecc */
static int check_ecc(void) static int check_ecc(void)
{ {
CRYPT_ECC_CTX userA; CRYPT_ECC_CTX userA;
CRYPT_ECC_CTX userB; CRYPT_ECC_CTX userB;
int ret; int ret;
byte sharedA[100]; byte sharedA[100];
@@ -1473,7 +1468,7 @@ static int check_ecc(void)
printf("mcapi ecc public export failed\n"); printf("mcapi ecc public export failed\n");
return -1; return -1;
} }
ret = CRYPT_ECC_PublicImport(&userB, sharedA, usedA); ret = CRYPT_ECC_PublicImport(&userB, sharedA, usedA);
if (ret != 0) { if (ret != 0) {
printf("mcapi ecc public import failed\n"); printf("mcapi ecc public import failed\n");

4
wolfcrypt/src/md5.c
View File

@@ -305,10 +305,6 @@ static int _InitMd5(Md5* md5)
{ {
int ret = 0; int ret = 0;
if (md5 == NULL) {
return BAD_FUNC_ARG;
}
md5->digest[0] = 0x67452301L; md5->digest[0] = 0x67452301L;
md5->digest[1] = 0xefcdab89L; md5->digest[1] = 0xefcdab89L;
md5->digest[2] = 0x98badcfeL; md5->digest[2] = 0x98badcfeL;

30
wolfcrypt/src/pwdbased.c
View File

@@ -322,25 +322,25 @@ int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen,
Md5 md5; Md5 md5;
ret = wc_InitMd5(&md5); ret = wc_InitMd5(&md5);
if (ret != 0) { if (ret != 0) {
return ret; break;
} }
ret = wc_Md5Update(&md5, buffer, totalLen); ret = wc_Md5Update(&md5, buffer, totalLen);
if (ret != 0) { if (ret != 0) {
return ret; break;
} }
ret = wc_Md5Final(&md5, Ai); ret = wc_Md5Final(&md5, Ai);
if (ret != 0) { if (ret != 0) {
return ret; break;
} }
for (i = 1; i < iterations; i++) { for (i = 1; i < iterations; i++) {
ret = wc_Md5Update(&md5, Ai, u); ret = wc_Md5Update(&md5, Ai, u);
if (ret != 0) { if (ret != 0) {
return ret; break;
} }
ret = wc_Md5Final(&md5, Ai); ret = wc_Md5Final(&md5, Ai);
if (ret != 0) { if (ret != 0) {
return ret; break;
} }
} }
} }
@@ -353,12 +353,24 @@ int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen,
ret = wc_InitSha(&sha); ret = wc_InitSha(&sha);
if (ret != 0) if (ret != 0)
break; break;
wc_ShaUpdate(&sha, buffer, totalLen); ret = wc_ShaUpdate(&sha, buffer, totalLen);
wc_ShaFinal(&sha, Ai); if (ret != 0) {
break;
}
ret = wc_ShaFinal(&sha, Ai);
if (ret != 0) {
break;
}
for (i = 1; i < iterations; i++) { for (i = 1; i < iterations; i++) {
wc_ShaUpdate(&sha, Ai, u); ret = wc_ShaUpdate(&sha, Ai, u);
wc_ShaFinal(&sha, Ai); if (ret != 0) {
break;
}
ret = wc_ShaFinal(&sha, Ai);
if (ret != 0) {
break;
}
} }
} }
break; break;