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

Fix issue with using wrong asyncDev in ConfirmSignature. Fix un-initialized Hmac in API unit tests.

This commit is contained in:
David Garske 2017-08-15 21:18:27 -07:00
parent ccc226eae4
commit 1f80fb952f
2 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tests/api.c
View File

@ -4969,9 +4969,15 @@ static int test_wc_Md5HmacFinal (void)
printf(testingFmt, "wc_HmacFinal() with MD5");
ret = wc_HmacSetKey(&hmac, MD5, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID);
if (ret != 0)
flag = ret;
if (!flag) {
ret = wc_HmacSetKey(&hmac, MD5, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
flag = ret;
}
}
if (!flag) {
@ -5010,6 +5016,9 @@ static int test_wc_Md5HmacFinal (void)
}
}
#endif
wc_HmacFree(&hmac);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
@ -5042,9 +5051,15 @@ static int test_wc_ShaHmacFinal (void)
printf(testingFmt, "wc_HmacFinal() with SHA");
ret = wc_HmacSetKey(&hmac, SHA, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID);
if (ret != 0)
flag = ret;
if (!flag) {
ret = wc_HmacSetKey(&hmac, SHA, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
flag = ret;
}
}
if (!flag) {
@ -5083,6 +5098,9 @@ static int test_wc_ShaHmacFinal (void)
}
}
#endif
wc_HmacFree(&hmac);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
@ -5116,9 +5134,15 @@ static int test_wc_Sha224HmacFinal (void)
printf(testingFmt, "wc_HmacFinal() with SHA224");
ret = wc_HmacSetKey(&hmac, SHA224, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID);
if (ret != 0)
flag = ret;
if (!flag) {
ret = wc_HmacSetKey(&hmac, SHA224, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
flag = ret;
}
}
if (!flag) {
@ -5157,6 +5181,9 @@ static int test_wc_Sha224HmacFinal (void)
}
}
#endif
wc_HmacFree(&hmac);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
@ -5189,9 +5216,15 @@ static int test_wc_Sha256HmacFinal (void)
printf(testingFmt, "wc_HmacFinal() with SHA256");
ret = wc_HmacSetKey(&hmac, SHA256, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID);
if (ret != 0)
flag = ret;
if (!flag) {
ret = wc_HmacSetKey(&hmac, SHA256, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
flag = ret;
}
}
if (!flag) {
@ -5230,6 +5263,9 @@ static int test_wc_Sha256HmacFinal (void)
}
}
#endif
wc_HmacFree(&hmac);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
@ -5263,9 +5299,15 @@ static int test_wc_Sha384HmacFinal (void)
printf(testingFmt, "wc_HmacFinal() with SHA384");
ret = wc_HmacSetKey(&hmac, SHA384, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID);
if (ret != 0)
flag = ret;
if (!flag) {
ret = wc_HmacSetKey(&hmac, SHA384, (byte*)key, (word32)XSTRLEN(key));
if (ret != 0) {
flag = ret;
}
}
if (!flag) {
@ -5303,6 +5345,9 @@ static int test_wc_Sha384HmacFinal (void)
}
}
#endif
wc_HmacFree(&hmac);
printf(resultFmt, flag == 0 ? passed : failed);
#endif

2
wolfcrypt/src/asn.c
View File

@ -4679,7 +4679,7 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
goto exit_cs;
}
#ifdef WOLFSSL_ASYNC_CRYPT
sigCtx->asyncDev = &sigCtx->key.ecc->asyncDev;
sigCtx->asyncDev = &sigCtx->key.ed25519->asyncDev;
#endif
break;
}