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

Merge pull request #785 from SparkiDev/fixes

Browse Source 
Fixes from merge of test coverage changes
This commit is contained in:
toddouska
2017-03-09 17:58:15 -08:00
committed by GitHub
parent 2b5dba798f 5c9eedbf69
commit 5a803730b8
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
certs/include.am
View File

@@ -58,4 +58,5 @@ dist_doc_DATA+= certs/taoCert.txt
EXTRA_DIST+= certs/ntru-key.raw EXTRA_DIST+= certs/ntru-key.raw
include certs/test/include.am
include certs/test-pathlen/include.am include certs/test-pathlen/include.am

12
certs/test/include.am Normal file
View File

@@ -0,0 +1,12 @@
# vim:ft=automake
# All paths should be given relative to the root
#
EXTRA_DIST += \
certs/test/cert-ext-ia.cfg \
certs/test/cert-ext-ia.der \
certs/test/cert-ext-nc.cfg \
certs/test/cert-ext-nc.der \
certs/test/cert-ext-ns.der \
certs/test/gen-ext-certs.sh

10
wolfcrypt/test/test.c
View File

@@ -881,7 +881,7 @@ int error_test()
* APIs. Check that the values that are not errors map to the unknown * APIs. Check that the values that are not errors map to the unknown
* string. * string.
*/ */
for (i = OPEN_RAN_E; i >= ECC_CDH_KAT_FIPS_E; i--) { for (i = OPEN_RAN_E; i >= BAD_PATH_ERROR; i--) {
errStr = wc_GetErrorString(i); errStr = wc_GetErrorString(i);
wc_ErrorString(i, out); wc_ErrorString(i, out);
@@ -1555,7 +1555,7 @@ int sha224_test(void)
ret = wc_Sha224GetHash(&sha, hash); ret = wc_Sha224GetHash(&sha, hash);
if (ret != 0) if (ret != 0)
return -22; return -22;
ret = wc_Sha224Update(&sha, (byte*)a.input + 1, a.inLen - 1); ret = wc_Sha224Update(&sha, (byte*)a.input + 1, (word32)(a.inLen - 1));
if (ret != 0) if (ret != 0)
return -23; return -23;
ret = wc_Sha224Final(&sha, hash); ret = wc_Sha224Final(&sha, hash);
@@ -1563,7 +1563,7 @@ int sha224_test(void)
return -24; return -24;
if (XMEMCMP(hash, a.output, a.outLen) != 0) if (XMEMCMP(hash, a.output, a.outLen) != 0)
return -25; return -25;
ret = wc_Sha224Hash((byte*)a.input, a.inLen, hash); ret = wc_Sha224Hash((byte*)a.input, (word32)a.inLen, hash);
if (ret != 0) if (ret != 0)
return -26; return -26;
if (XMEMCMP(hash, a.output, a.outLen) != 0) if (XMEMCMP(hash, a.output, a.outLen) != 0)
@@ -1799,7 +1799,7 @@ int sha384_test(void)
ret = wc_Sha384GetHash(&sha, hash); ret = wc_Sha384GetHash(&sha, hash);
if (ret != 0) if (ret != 0)
return -22; return -22;
ret = wc_Sha384Update(&sha, (byte*)a.input + 1, a.inLen - 1); ret = wc_Sha384Update(&sha, (byte*)a.input + 1, (word32)(a.inLen - 1));
if (ret != 0) if (ret != 0)
return -23; return -23;
ret = wc_Sha384Final(&sha, hash); ret = wc_Sha384Final(&sha, hash);
@@ -1808,7 +1808,7 @@ int sha384_test(void)
if (XMEMCMP(hash, a.output, a.outLen) != 0) if (XMEMCMP(hash, a.output, a.outLen) != 0)
return -25; return -25;
XMEMSET(hash, 0, a.outLen); XMEMSET(hash, 0, a.outLen);
ret = wc_Sha384Hash((byte*)a.input, a.inLen, hash); ret = wc_Sha384Hash((byte*)a.input, (word32)a.inLen, hash);
if (ret != 0) if (ret != 0)
return -26; return -26;
if (XMEMCMP(hash, a.output, a.outLen) != 0) if (XMEMCMP(hash, a.output, a.outLen) != 0)