wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5977 from dgarske/kcapi_opensslextra

Browse Source 
Fixes for building KCAPI with opensslextra enabled
This commit is contained in:
Sean Parkinson
2023-01-17 02:13:50 +10:00
committed by GitHub
parent b01e42a96c fec4fe6095
commit b15bc3d236
6 changed files with 144 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pk.c
View File

@ -10918,7 +10918,7 @@ int wolfSSL_EC_POINT_mul(const WOLFSSL_EC_GROUP *group, WOLFSSL_EC_POINT *r,
if (n && q && m) {
/* r = generator * n + q * m */
#ifdef ECC_SHAMIR
#if defined(ECC_SHAMIR) && !defined(WOLFSSL_KCAPI_ECC)
if (ecc_mul2add(result, (mp_int*)n->internal,
(ecc_point*)q->internal, (mp_int*)m->internal,
result, a, prime, NULL)

244
src/ssl.c
View File

@ -17848,6 +17848,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL || HAVE_SECRET_CALLBACK */
#ifdef OPENSSL_EXTRA
unsigned long wolfSSLeay(void)
{
return SSLEAY_VERSION_NUMBER;
@ -17881,12 +17882,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_MD5_Update(WOLFSSL_MD5_CTX* md5, const void* input,
unsigned long sz)
{
@ -17897,9 +17896,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -17917,9 +17915,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
/* Apply MD5 transformation to the data */
int wolfSSL_MD5_Transform(WOLFSSL_MD5_CTX* md5, const unsigned char* data)
@ -17933,18 +17930,15 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0;
}
#if defined(BIG_ENDIAN_ORDER)
{
ByteReverseWords((word32*)data, (word32*)data, WC_MD5_BLOCK_SIZE);
}
#endif
ret = wc_Md5Transform((wc_Md5*)md5, data);
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
else
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
unsigned char *wolfSSL_MD5(const unsigned char* data, size_t len,
@ -17978,9 +17972,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -17994,9 +17987,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18014,12 +18006,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#if defined(OPENSSL_EXTRA)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
/* Apply SHA1 transformation to the data */
@ -18034,20 +18024,16 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0;
}
#if defined(LITTLE_ENDIAN_ORDER)
{
ByteReverseWords((word32*)data, (word32*)data, WC_SHA_BLOCK_SIZE);
}
#endif
ret = wc_ShaTransform((wc_Sha*)sha, data);
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
else
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#endif
#endif
int wolfSSL_SHA1_Init(WOLFSSL_SHA_CTX* sha)
{
@ -18069,7 +18055,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
WOLFSSL_ENTER("SHA1_Final");
return SHA_Final(output, sha);
}
#if defined(OPENSSL_EXTRA)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
/* Apply SHA1 transformation to the data */
@ -18080,9 +18066,9 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return (wolfSSL_SHA_Transform(sha, data));
}
#endif
#endif
#endif /* !NO_SHA */
#ifndef NO_SHA256
#ifdef WOLFSSL_SHA224
int wolfSSL_SHA224_Init(WOLFSSL_SHA224_CTX* sha)
@ -18097,9 +18083,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18113,9 +18098,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18133,14 +18117,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#endif /* WOLFSSL_SHA224 */
int wolfSSL_SHA256_Init(WOLFSSL_SHA256_CTX* sha256)
{
int ret;
@ -18153,12 +18135,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA256_Update(WOLFSSL_SHA256_CTX* sha, const void* input,
unsigned long sz)
{
@ -18169,12 +18149,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA256_Final(byte* output, WOLFSSL_SHA256_CTX* sha)
{
int ret;
@ -18189,15 +18167,14 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#if defined(OPENSSL_EXTRA)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))) && \
!defined(WOLFSSL_DEVCRYPTO_HASH) && !defined(WOLFSSL_AFALG_HASH)
!defined(WOLFSSL_DEVCRYPTO_HASH) && !defined(WOLFSSL_AFALG_HASH) && \
!defined(WOLFSSL_KCAPI_HASH) /* doesn't support direct transform */
/* Apply SHA256 transformation to the data */
int wolfSSL_SHA256_Transform(WOLFSSL_SHA256_CTX* sha256,
const unsigned char* data)
@ -18210,20 +18187,18 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0;
}
#if defined(LITTLE_ENDIAN_ORDER)
{
ByteReverseWords((word32*)data, (word32*)data, WC_SHA256_BLOCK_SIZE);
}
#endif
ret = wc_Sha256Transform((wc_Sha256*)sha256, data);
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
else
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#endif
#endif
#endif /* !NO_SHA256 */
#ifdef WOLFSSL_SHA384
@ -18239,12 +18214,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA384_Update(WOLFSSL_SHA384_CTX* sha, const void* input,
unsigned long sz)
{
@ -18255,12 +18228,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA384_Final(byte* output, WOLFSSL_SHA384_CTX* sha)
{
int ret;
@ -18275,9 +18246,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#endif /* WOLFSSL_SHA384 */
@ -18297,9 +18267,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18313,9 +18282,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18333,13 +18301,13 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))) && \
!defined(WOLFSSL_KCAPI_HASH) /* doesn't support direct transform */
/* Apply SHA512 transformation to the data */
int wolfSSL_SHA512_Transform(WOLFSSL_SHA512_CTX* sha512,
const unsigned char* data)
@ -18357,11 +18325,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
else
return WOLFSSL_FAILURE;
}
#endif /* !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
(HAVE_FIPS_VERSION > 2)) */
(HAVE_FIPS_VERSION > 2)) && !WOLFSSL_KCAPI_HASH */
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
#if !defined(WOLFSSL_NOSHA512_224)
@ -18369,13 +18336,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
{
int ret;
WOLFSSL_ENTER("wolfSSL_SHA512_224_Init");
WOLFSSL_ENTER("SHA512_224_Init");
ret = wc_InitSha512_224((wc_Sha512*)sha);
/* return WOLFSSL_SUCCESS on success, WOLFSSL_FAILURE otherwise */
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18384,13 +18350,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
{
int ret;
WOLFSSL_ENTER("wolfSSL_SHA512_224_Update");
WOLFSSL_ENTER("SHA512_224_Update");
ret = wc_Sha512_224Update((wc_Sha512*)sha, (const byte*)input, (word32)sz);
/* return WOLFSSL_SUCCESS on success, WOLFSSL_FAILURE otherwise */
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18398,13 +18363,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
{
int ret;
WOLFSSL_ENTER("wolfSSL_SHA512_224_Final");
WOLFSSL_ENTER("SHA512_224_Final");
ret = wc_Sha512_224Final((wc_Sha512*)sha, output);
/* return WOLFSSL_SUCCESS on success, WOLFSSL_FAILURE otherwise */
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18427,7 +18391,6 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
else
return WOLFSSL_FAILURE;
}
#endif /* !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
@ -18439,13 +18402,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
{
int ret;
WOLFSSL_ENTER("wolfSSL_SHA512_256_Init");
WOLFSSL_ENTER("SHA512_256_Init");
ret = wc_InitSha512_256((wc_Sha512*)sha);
/* return WOLFSSL_SUCCESS on success, WOLFSSL_FAILURE otherwise */
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18454,13 +18416,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
{
int ret;
WOLFSSL_ENTER("wolfSSL_SHA512_256_Update");
WOLFSSL_ENTER("SHA512_256_Update");
ret = wc_Sha512_256Update((wc_Sha512*)sha, (const byte*)input, (word32)sz);
/* return WOLFSSL_SUCCESS on success, WOLFSSL_FAILURE otherwise */
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18468,13 +18429,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
{
int ret;
WOLFSSL_ENTER("wolfSSL_SHA512_256_Final");
WOLFSSL_ENTER("SHA512_256_Final");
ret = wc_Sha512_256Final((wc_Sha512*)sha, output);
/* return WOLFSSL_SUCCESS on success, 0 otherwise */
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
@ -18497,7 +18457,6 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return WOLFSSL_SUCCESS;
else
return WOLFSSL_FAILURE;
}
#endif /* !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
@ -18510,7 +18469,6 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
#ifdef WOLFSSL_SHA3
#ifndef WOLFSSL_NOSHA3_224
int wolfSSL_SHA3_224_Init(WOLFSSL_SHA3_224_CTX* sha)
{
int ret;
@ -18523,12 +18481,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_224_Update(WOLFSSL_SHA3_224_CTX* sha, const void* input,
unsigned long sz)
{
@ -18539,12 +18495,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_224_Final(byte* output, WOLFSSL_SHA3_224_CTX* sha)
{
int ret;
@ -18559,14 +18513,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#endif /* WOLFSSL_NOSHA3_224 */
#ifndef WOLFSSL_NOSHA3_256
int wolfSSL_SHA3_256_Init(WOLFSSL_SHA3_256_CTX* sha3_256)
{
@ -18580,12 +18532,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_256_Update(WOLFSSL_SHA3_256_CTX* sha, const void* input,
unsigned long sz)
{
@ -18596,12 +18546,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_256_Final(byte* output, WOLFSSL_SHA3_256_CTX* sha)
{
int ret;
@ -18616,13 +18564,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#endif /* WOLFSSL_NOSHA3_256 */
int wolfSSL_SHA3_384_Init(WOLFSSL_SHA3_384_CTX* sha)
{
int ret;
@ -18635,12 +18581,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_384_Update(WOLFSSL_SHA3_384_CTX* sha, const void* input,
unsigned long sz)
{
@ -18651,12 +18595,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_384_Final(byte* output, WOLFSSL_SHA3_384_CTX* sha)
{
int ret;
@ -18671,15 +18613,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#ifndef WOLFSSL_NOSHA3_512
int wolfSSL_SHA3_512_Init(WOLFSSL_SHA3_512_CTX* sha)
{
int ret;
@ -18692,12 +18630,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_512_Update(WOLFSSL_SHA3_512_CTX* sha, const void* input,
unsigned long sz)
{
@ -18708,12 +18644,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
int wolfSSL_SHA3_512_Final(byte* output, WOLFSSL_SHA3_512_CTX* sha)
{
int ret;
@ -18728,11 +18662,9 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
}
#endif /* WOLFSSL_NOSHA3_512 */
#endif /* WOLFSSL_SHA3 */

6
tests/api.c
View File

@ -43253,7 +43253,8 @@ static int test_wolfSSL_SHA256_Transform(void)
#if defined(OPENSSL_EXTRA) && !defined(NO_SHA256)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))) && \
!defined(WOLFSSL_DEVCRYPTO_HASH) && !defined(WOLFSSL_AFALG_HASH)
!defined(WOLFSSL_DEVCRYPTO_HASH) && !defined(WOLFSSL_AFALG_HASH) && \
!defined(WOLFSSL_KCAPI_HASH)
byte input1[] = "";
byte input2[] = "abc";
byte local[WC_SHA256_BLOCK_SIZE];
@ -43345,7 +43346,8 @@ static int test_wolfSSL_SHA512_Transform(void)
int res = TEST_SKIPPED;
#if defined(OPENSSL_EXTRA) && defined(WOLFSSL_SHA512)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))) && \
!defined(WOLFSSL_KCAPI_HASH)
byte input1[] = "";
byte input2[] = "abc";
byte local[WC_SHA512_BLOCK_SIZE];

7
wolfcrypt/src/sha256.c
View File

@ -1399,8 +1399,6 @@ static int InitSha256(wc_Sha256* sha256)
return InitSha256(sha256); /* reset state */
}
#endif /* !WOLFSSL_KCAPI_HASH */
#if defined(OPENSSL_EXTRA)
/* Apply SHA256 transformation to the data */
/* @param sha a pointer to wc_Sha256 structure */
@ -1414,7 +1412,10 @@ static int InitSha256(wc_Sha256* sha256)
return (Transform_Sha256(sha, data));
}
#endif
#endif /* XTRANSFORM */
#endif /* OPENSSL_EXTRA */
#endif /* !WOLFSSL_KCAPI_HASH */
#ifdef WOLFSSL_SHA224

6
wolfcrypt/src/sha512.c
View File

@ -1176,7 +1176,7 @@ void wc_Sha512Free(wc_Sha512* sha512)
wolfAsync_DevCtxFree(&sha512->asyncDev, WOLFSSL_ASYNC_MARKER_SHA512);
#endif /* WOLFSSL_ASYNC_CRYPT */
}
#if defined(OPENSSL_EXTRA)
#if defined(OPENSSL_EXTRA) && !defined(WOLFSSL_KCAPI_HASH)
/* Apply SHA512 transformation to the data */
/* @param sha a pointer to wc_Sha512 structure */
/* @param data data to be applied SHA512 transformation */
@ -1197,7 +1197,7 @@ int wc_Sha512Transform(wc_Sha512* sha, const unsigned char* data)
}
#ifdef WOLFSSL_SMALL_STACK
buffer = (word64 *)XMALLOC(sizeof(word64) * 16, sha->heap,
buffer = (word64*)XMALLOC(WC_SHA512_BLOCK_SIZE, sha->heap,
DYNAMIC_TYPE_TMP_BUFFER);
if (buffer == NULL)
return MEMORY_E;
@ -1217,7 +1217,7 @@ int wc_Sha512Transform(wc_Sha512* sha, const unsigned char* data)
ByteReverseWords64((word64*)data, (word64*)data,
WC_SHA512_BLOCK_SIZE);
}
#endif /* !LITTLE_ENDIAN_ORDER */
#endif /* LITTLE_ENDIAN_ORDER */
XMEMCPY(buffer, sha->buffer, WC_SHA512_BLOCK_SIZE);
XMEMCPY(sha->buffer, data, WC_SHA512_BLOCK_SIZE);

2
wolfssl/openssl/sha.h
View File

@ -185,7 +185,7 @@ typedef WOLFSSL_SHA256_CTX SHA256_CTX;
#ifdef WOLFSSL_SHA384
typedef struct WOLFSSL_SHA384_CTX {
/* big enough to hold wolfCrypt Sha384, but check on init */
void* holder[(268 + WC_ASYNC_DEV_SIZE) / sizeof(void*)];
void* holder[(288 + WC_ASYNC_DEV_SIZE) / sizeof(void*)];
} WOLFSSL_SHA384_CTX;
WOLFSSL_API int wolfSSL_SHA384_Init(WOLFSSL_SHA384_CTX* sha);