Skip to content

Set hashType in ports #10193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
padelsbach wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Set hashType in ports #10193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion wolfcrypt/src/port/caam/caam_sha.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,13 @@ int wc_Sha384Final(wc_Sha384* sha, byte* out)
#ifdef WOLFSSL_SHA512
int wc_InitSha512_ex(wc_Sha512* sha, void* heap, int devId)
{
return _InitSha(sha, heap, devId, SHA512_DIGEST_SIZE, CAAM_SHA512);
int ret = _InitSha(sha, heap, devId, SHA512_DIGEST_SIZE, CAAM_SHA512);
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512;
}
#endif
return ret;
}


Expand Down
15 changes: 15 additions & 0 deletions wolfcrypt/src/port/cypress/psoc6_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,11 @@ int wc_InitSha512_ex(wc_Sha512* sha, void* heap, int devid)
/* Release the lock */
wolfSSL_CryptHwMutexUnLock();
}
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512;
}
#endif
return ret;
}

Expand Down Expand Up @@ -606,6 +611,11 @@ int wc_InitSha512_224_ex(wc_Sha512* sha, void* heap, int devid)
/* Release the lock */
wolfSSL_CryptHwMutexUnLock();
}
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512_224;
}
#endif
return ret;
}

Expand Down Expand Up @@ -658,6 +668,11 @@ int wc_InitSha512_256_ex(wc_Sha512* sha, void* heap, int devid)
/* Release the lock */
wolfSSL_CryptHwMutexUnLock();
}
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512_256;
}
#endif
return ret;
}

Expand Down
31 changes: 26 additions & 5 deletions wolfcrypt/src/port/kcapi/kcapi_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,17 @@ static const char WC_NAME_SHA512[] = "sha512";
/* create KCAPI handle for SHA512 operation */
int wc_InitSha512_ex(wc_Sha512* sha, void* heap, int devid)
{
int ret;
if (sha == NULL) {
return BAD_FUNC_ARG;
}
return KcapiHashInit(&sha->kcapi, heap, devid, WC_NAME_SHA512);
ret = KcapiHashInit(&sha->kcapi, heap, devid, WC_NAME_SHA512);
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512;
}
#endif
return ret;
}


Expand Down Expand Up @@ -473,13 +480,20 @@ int wc_Sha512Copy(wc_Sha512* src, wc_Sha512* dst)
#if !defined(WOLFSSL_NOSHA512_224)
static const char WC_NAME_SHA512_224[] = "sha512-224";

/* create KCAPI handle for SHA512 operation */
/* create KCAPI handle for SHA512/224 operation */
int wc_InitSha512_224_ex(wc_Sha512* sha, void* heap, int devid)
{
int ret;
if (sha == NULL) {
return BAD_FUNC_ARG;
}
return KcapiHashInit(&sha->kcapi, heap, devid, WC_NAME_SHA512_224);
ret = KcapiHashInit(&sha->kcapi, heap, devid, WC_NAME_SHA512_224);
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512_224;
}
#endif
return ret;
}


Expand Down Expand Up @@ -512,13 +526,20 @@ int wc_Sha512_224Copy(wc_Sha512* src, wc_Sha512* dst)
#if !defined(WOLFSSL_NOSHA512_256)
static const char WC_NAME_SHA512_256[] = "sha512-256";

/* create KCAPI handle for SHA512 operation */
/* create KCAPI handle for SHA512/256 operation */
int wc_InitSha512_256_ex(wc_Sha512* sha, void* heap, int devid)
{
int ret;
if (sha == NULL) {
return BAD_FUNC_ARG;
}
return KcapiHashInit(&sha->kcapi, heap, devid, WC_NAME_SHA512_256);
ret = KcapiHashInit(&sha->kcapi, heap, devid, WC_NAME_SHA512_256);
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512_256;
}
#endif
return ret;
}


Expand Down
3 changes: 3 additions & 0 deletions wolfcrypt/src/port/maxim/max3266x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,9 @@ WOLFSSL_API int wc_InitSha512_ex(wc_Sha512* sha512, void* heap, int devId)
(void)devId;
XMEMSET(sha512, 0, sizeof(*sha512));
sha512->heap = heap;
#if defined(WOLFSSL_SHA512_HASHTYPE)
sha512->hashType = WC_HASH_TYPE_SHA512;
#endif
return 0;
}

Expand Down
9 changes: 9 additions & 0 deletions wolfcrypt/src/port/riscv/riscv-64-sha512.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,9 @@ int wc_InitSha512_ex(wc_Sha512* sha512, void* heap, int devId)
int ret = InitSha512(sha512, heap, devId);
if (ret == 0) {
InitSha512_State(sha512);
#if defined(WOLFSSL_SHA512_HASHTYPE)
sha512->hashType = WC_HASH_TYPE_SHA512;
#endif
}
return ret;
}
Expand Down Expand Up @@ -1302,6 +1305,9 @@ int wc_InitSha512_224_ex(wc_Sha512* sha512, void* heap, int devId)
int ret = InitSha512(sha512, heap, devId);
if (ret == 0) {
InitSha512_224_State(sha512);
#if defined(WOLFSSL_SHA512_HASHTYPE)
sha512->hashType = WC_HASH_TYPE_SHA512_224;
#endif
}
return ret;
}
Expand Down Expand Up @@ -1402,6 +1408,9 @@ int wc_InitSha512_256_ex(wc_Sha512* sha512, void* heap, int devId)
int ret = InitSha512(sha512, heap, devId);
if (ret == 0) {
InitSha512_256_State(sha512);
#if defined(WOLFSSL_SHA512_HASHTYPE)
sha512->hashType = WC_HASH_TYPE_SHA512_256;
#endif
}
return ret;
}
Expand Down
9 changes: 8 additions & 1 deletion wolfcrypt/src/port/silabs/silabs_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,21 @@ int wc_Sha384Final(wc_Sha384* sha, byte* hash)
#ifdef WOLFSSL_SILABS_SHA512
int wc_InitSha512_ex(wc_Sha512* sha, void* heap, int devId)
{
int ret;
if (sha == NULL) {
return BAD_FUNC_ARG;
}

(void)devId;
(void)heap;

return wc_silabs_se_hash_init(&sha->silabsCtx, WC_HASH_TYPE_SHA512);
ret = wc_silabs_se_hash_init(&sha->silabsCtx, WC_HASH_TYPE_SHA512);
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha->hashType = WC_HASH_TYPE_SHA512;
}
#endif
return ret;
}


Expand Down
18 changes: 17 additions & 1 deletion wolfcrypt/src/sha512.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,18 @@
}
int wc_InitSha512_ex(wc_Sha512* sha512, void* heap, int devId)
{
int ret;
if (sha512 == NULL) {
return BAD_FUNC_ARG;
}
(void)devId;
return se050_hash_init(&sha512->se050Ctx, heap);
ret = se050_hash_init(&sha512->se050Ctx, heap);
#if defined(WOLFSSL_SHA512_HASHTYPE)
if (ret == 0) {
sha512->hashType = WC_HASH_TYPE_SHA512;
}
#endif
return ret;
}
int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len)
{
Expand Down Expand Up @@ -252,6 +259,9 @@

XMEMSET(sha512, 0, sizeof(wc_Sha512));
wc_Stm32_Hash_Init(&sha512->stmCtx);
#if defined(WOLFSSL_SHA512_HASHTYPE)
sha512->hashType = WC_HASH_TYPE_SHA512;
#endif
return 0;
}

Expand Down Expand Up @@ -2375,6 +2385,9 @@ int wc_InitSha512_224_ex(wc_Sha512* sha512, void* heap, int devId)

XMEMSET(sha512, 0, sizeof(wc_Sha512));
wc_Stm32_Hash_Init(&sha512->stmCtx);
#if defined(WOLFSSL_SHA512_HASHTYPE)
sha512->hashType = WC_HASH_TYPE_SHA512_224;
#endif
return 0;
}

Expand Down Expand Up @@ -2518,6 +2531,9 @@ int wc_Sha512_224Transform(wc_Sha512* sha, const unsigned char* data)

XMEMSET(sha512, 0, sizeof(wc_Sha512));
wc_Stm32_Hash_Init(&sha512->stmCtx);
#if defined(WOLFSSL_SHA512_HASHTYPE)
sha512->hashType = WC_HASH_TYPE_SHA512_256;
#endif
return 0;
}

Expand Down
Loading