WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3331 from dgarske/armasm 

Fixes for ARM ASM and API unit test bad build macros
pull/3342/head
toddouska 2020-09-25 12:41:30 -07:00 committed by GitHub
parent 1668f6f626 8d2c8b0c89
commit 2d97acadc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
tests/api.c
View File

@ -6081,7 +6081,6 @@ static int test_wc_InitSha(void)
wc_ShaFree(&sha);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6092,7 +6091,6 @@ static int test_wc_InitSha(void)
*/
static int test_wc_ShaUpdate (void)
{
int flag = 0;
#ifndef NO_SHA
wc_Sha sha;
@ -6390,9 +6388,9 @@ static int test_wc_Sha256Update (void)
}
wc_Sha256Free(&sha256);
/* If not returned then the unit test passed. */
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6475,8 +6473,8 @@ static int test_wc_Sha256Final (void)
static int test_wc_Sha256FinalRaw (void)
{
int flag = 0;
#if !defined(NO_SHA256) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#if !defined(NO_SHA256) && !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 3)))
wc_Sha256 sha256;
byte* hash_test[3];
byte hash1[WC_SHA256_DIGEST_SIZE];
@ -6535,7 +6533,6 @@ static int test_wc_Sha256FinalRaw (void)
wc_Sha256Free(&sha256);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6551,7 +6548,6 @@ static int test_wc_Sha256GetFlags (void)
wc_Sha256 sha256;
word32 flags = 0;
printf(testingFmt, "wc_Sha256GetFlags()");
/* Initialize */
@ -6568,7 +6564,6 @@ static int test_wc_Sha256GetFlags (void)
wc_Sha256Free(&sha256);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6580,12 +6575,10 @@ static int test_wc_Sha256Free (void)
{
int flag = 0;
#ifndef NO_SHA256
printf(testingFmt, "wc_Sha256Free()");
wc_Sha256Free(NULL);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6609,29 +6602,28 @@ static int test_wc_Sha256GetHash (void)
flag = wc_Sha256GetHash(&sha256, hash1);
}
/*test bad arguements*/
if (flag == 0) {
if (flag == 0) {
flag = wc_Sha256GetHash(NULL, NULL);
if (flag == BAD_FUNC_ARG) {
flag = 0;
}
}
if (flag == 0) {
}
if (flag == 0) {
flag = wc_Sha256GetHash(NULL, hash1);
if (flag == BAD_FUNC_ARG) {
flag = 0;
}
}
if (flag == 0) {
}
if (flag == 0) {
flag = wc_Sha256GetHash(&sha256, NULL);
if (flag == BAD_FUNC_ARG) {
flag = 0;
}
}
}
wc_Sha256Free(&sha256);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6680,7 +6672,6 @@ static int test_wc_Sha256Copy (void)
wc_Sha256Free(&temp);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6819,7 +6810,6 @@ static int test_wc_Sha512Update (void)
/* If not returned then the unit test passed test vectors. */
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6889,7 +6879,6 @@ static int test_wc_Sha512Final (void)
wc_Sha512Free(&sha512);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha512Final */
@ -6899,7 +6888,7 @@ static int test_wc_Sha512Final (void)
static int test_wc_Sha512GetFlags (void)
{
int flag = 0;
#if !defined(NO_SHA512) && \
#if defined(WOLFSSL_SHA512) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
wc_Sha512 sha512;
word32 flags = 0;
@ -6921,7 +6910,6 @@ static int test_wc_Sha512GetFlags (void)
wc_Sha512Free(&sha512);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -6932,8 +6920,8 @@ static int test_wc_Sha512GetFlags (void)
static int test_wc_Sha512FinalRaw (void)
{
int flag = 0;
#if !defined(NO_SHA512) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#if defined(WOLFSSL_SHA512) && !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 3)))
wc_Sha512 sha512;
byte* hash_test[3];
byte hash1[WC_SHA512_DIGEST_SIZE];
@ -6992,38 +6980,34 @@ static int test_wc_Sha512FinalRaw (void)
wc_Sha512Free(&sha512);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha512FinalRaw */
/*
* Unit test function for wc_Sha512Free()
*/
static int test_wc_Sha512Free (void)
{
int flag = 0;
#if !defined(NO_SHA512) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA512
printf(testingFmt, "wc_Sha512Free()");
wc_Sha512Free(NULL);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha512Free */
/*
* Unit test function for wc_Sha512GetHash()
*/
static int test_wc_Sha512GetHash (void)
{
int flag = 0;
#if !defined(NO_SHA512) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA512
wc_Sha512 sha512;
byte hash1[WC_SHA512_DIGEST_SIZE];
@ -7058,19 +7042,18 @@ static int test_wc_Sha512GetHash (void)
wc_Sha512Free(&sha512);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha512GetHash */
/*
* Unit test function for wc_Sha512Copy()
*/
static int test_wc_Sha512Copy (void)
{
int flag = 0;
#if !defined(NO_SHA512) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA512
wc_Sha512 sha512;
wc_Sha512 temp;
@ -7104,12 +7087,10 @@ static int test_wc_Sha512Copy (void)
}
}
wc_Sha512Free(&sha512);
wc_Sha512Free(&temp);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -7141,8 +7122,8 @@ static int test_wc_InitSha384 (void)
}
wc_Sha384Free(&sha384);
printf(resultFmt, flag == 0 ? passed : failed);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_InitSha384 */
@ -7328,7 +7309,7 @@ static int test_wc_Sha384Final (void)
static int test_wc_Sha384GetFlags (void)
{
int flag = 0;
#if !defined(NO_SHA384) && \
#if defined(WOLFSSL_SHA384) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
wc_Sha384 sha384;
word32 flags = 0;
@ -7361,8 +7342,8 @@ static int test_wc_Sha384GetFlags (void)
static int test_wc_Sha384FinalRaw (void)
{
int flag = 0;
#if !defined(NO_SHA384) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#if defined(WOLFSSL_SHA384) && !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 3)))
wc_Sha384 sha384;
byte* hash_test[3];
byte hash1[WC_SHA384_DIGEST_SIZE];
@ -7421,7 +7402,6 @@ static int test_wc_Sha384FinalRaw (void)
wc_Sha384Free(&sha384);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -7432,15 +7412,12 @@ static int test_wc_Sha384FinalRaw (void)
static int test_wc_Sha384Free (void)
{
int flag = 0;
#if !defined(NO_SHA384) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA384
printf(testingFmt, "wc_Sha384Free()");
wc_Sha384Free(NULL);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -7451,8 +7428,7 @@ static int test_wc_Sha384Free (void)
static int test_wc_Sha384GetHash (void)
{
int flag = 0;
#if !defined(NO_SHA384) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA384
wc_Sha384 sha384;
byte hash1[WC_SHA384_DIGEST_SIZE];
@ -7487,7 +7463,6 @@ static int test_wc_Sha384GetHash (void)
wc_Sha384Free(&sha384);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
@ -7498,8 +7473,7 @@ static int test_wc_Sha384GetHash (void)
static int test_wc_Sha384Copy (void)
{
int flag = 0;
#if !defined(NO_SHA384) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA384
wc_Sha384 sha384;
wc_Sha384 temp;
@ -7537,11 +7511,11 @@ static int test_wc_Sha384Copy (void)
wc_Sha384Free(&temp);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha384Copy */
/*
* Testing wc_InitSha224();
*/
@ -7575,8 +7549,6 @@ static int test_wc_InitSha224 (void)
return flag;
} /* END test_wc_InitSha224 */
/*
* Unit test on wc_Sha224Update
*/
@ -7673,14 +7645,11 @@ static int test_wc_Sha224Update (void)
/* If not returned then the unit test passed test vectors. */
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha224Update */
/*
* Unit test for wc_Sha224Final();
*/
@ -7746,10 +7715,10 @@ static int test_wc_Sha224Final (void)
wc_Sha224Free(&sha224);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha224Final */
/*
* Unit test function for wc_Sha224SetFlags()
*/
@ -7782,6 +7751,7 @@ static int test_wc_Sha224SetFlags (void)
return flag;
} /* END test_wc_Sha224SetFlags */
/*
* Unit test function for wc_Sha224GetFlags()
*/
@ -7821,27 +7791,24 @@ static int test_wc_Sha224GetFlags (void)
static int test_wc_Sha224Free (void)
{
int flag = 0;
#if defined(WOLFSSL_SHA224) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA224
printf(testingFmt, "wc_Sha224Free()");
wc_Sha224Free(NULL);
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_Sha224Free */
/*
* Unit test function for wc_Sha224GetHash()
*/
static int test_wc_Sha224GetHash (void)
{
int flag = 0;
#if defined(WOLFSSL_SHA224) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA224
wc_Sha224 sha224;
byte hash1[WC_SHA224_DIGEST_SIZE];
@ -7881,14 +7848,14 @@ static int test_wc_Sha224GetHash (void)
return flag;
} /* END test_wc_Sha224GetHash */
/*
* Unit test function for wc_Sha224Copy()
*/
static int test_wc_Sha224Copy (void)
{
int flag = 0;
#if defined(WOLFSSL_SHA224) && \
(defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB))
#ifdef WOLFSSL_SHA224
wc_Sha224 sha224;
wc_Sha224 temp;
@ -7932,6 +7899,8 @@ static int test_wc_Sha224Copy (void)
return flag;
} /* END test_wc_Sha224Copy */
/*
* Testing wc_InitRipeMd()
*/
@ -7965,7 +7934,6 @@ static int test_wc_InitRipeMd (void)
} /* END test_wc_InitRipeMd */
/*
* Testing wc_RipeMdUpdate()
*/
@ -8066,8 +8034,6 @@ static int test_wc_RipeMdUpdate (void)
} /* END test_wc_RipeMdUdpate */
/*
* Unit test function for wc_RipeMdFinal()
*/
@ -8131,15 +8097,11 @@ static int test_wc_RipeMdFinal (void)
}
printf(resultFmt, flag == 0 ? passed : failed);
#endif
return flag;
} /* END test_wc_RipeMdFinal */
/*
* Testing wc_InitSha3_224, wc_InitSha3_256, wc_InitSha3_384, and
* wc_InitSha3_512

21
wolfcrypt/src/port/arm/armv8-sha256.c
View File

@ -1317,6 +1317,27 @@ int wc_Sha256Update(wc_Sha256* sha256, const byte* data, word32 len)
return Sha256Update(sha256, data, len);
}
int wc_Sha256FinalRaw(wc_Sha256* sha256, byte* hash)
{
#ifdef LITTLE_ENDIAN_ORDER
word32 digest[WC_SHA256_DIGEST_SIZE / sizeof(word32)];
#endif
if (sha256 == NULL || hash == NULL) {
return BAD_FUNC_ARG;
}
#ifdef LITTLE_ENDIAN_ORDER
ByteReverseWords((word32*)digest, (word32*)sha256->digest,
WC_SHA256_DIGEST_SIZE);
XMEMCPY(hash, digest, WC_SHA256_DIGEST_SIZE);
#else
XMEMCPY(hash, sha256->digest, WC_SHA256_DIGEST_SIZE);
#endif
return 0;
}
int wc_Sha256Final(wc_Sha256* sha256, byte* hash)
{
int ret;