mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mcapi/mcapi_test.c
View File

@ -220,20 +220,15 @@ static int check_md5(void)
CRYPT_MD5_Initialize(&mcMd5);
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);
if (ret != 0) {
return ret;
}
if (ret == 0) {
CRYPT_MD5_Finalize(&mcMd5, mcDigest);
ret = wc_Md5Final(&defMd5, defDigest);
if (ret != 0) {
return ret;
}
if (memcmp(mcDigest, defDigest, CRYPT_MD5_DIGEST_SIZE) != 0) {

4
wolfcrypt/src/md5.c
View File

@ -305,10 +305,6 @@ static int _InitMd5(Md5* md5)
{
int ret = 0;
if (md5 == NULL) {
return BAD_FUNC_ARG;
}
md5->digest[0] = 0x67452301L;
md5->digest[1] = 0xefcdab89L;
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;
ret = wc_InitMd5(&md5);
if (ret != 0) {
return ret;
break;
}
ret = wc_Md5Update(&md5, buffer, totalLen);
if (ret != 0) {
return ret;
break;
}
ret = wc_Md5Final(&md5, Ai);
if (ret != 0) {
return ret;
break;
}
for (i = 1; i < iterations; i++) {
ret = wc_Md5Update(&md5, Ai, u);
if (ret != 0) {
return ret;
break;
}
ret = wc_Md5Final(&md5, Ai);
if (ret != 0) {
return ret;
break;
}
}
}
@ -353,12 +353,24 @@ int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen,
ret = wc_InitSha(&sha);
if (ret != 0)
break;
wc_ShaUpdate(&sha, buffer, totalLen);
wc_ShaFinal(&sha, Ai);
ret = wc_ShaUpdate(&sha, buffer, totalLen);
if (ret != 0) {
break;
}
ret = wc_ShaFinal(&sha, Ai);
if (ret != 0) {
break;
}
for (i = 1; i < iterations; i++) {
wc_ShaUpdate(&sha, Ai, u);
wc_ShaFinal(&sha, Ai);
ret = wc_ShaUpdate(&sha, Ai, u);
if (ret != 0) {
break;
}
ret = wc_ShaFinal(&sha, Ai);
if (ret != 0) {
break;
}
}
}
break;