Skip to content

Fix swapped WOLFSSL_SILABS_SHA384/SHA512 defines in sha512.c. #9224

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

Merged
dgarske merged 6 commits into from
Oct 8, 2025
Merged

Fix swapped WOLFSSL_SILABS_SHA384/SHA512 defines in sha512.c. #9224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4d9c90
Fix swapped WOLFSSL_SILABS_SHA384/SHA512 defines in sha512.c.
kareem-wolfssl Sep 19, 2025
1c7fe06
Also gate out wc_Sha512Final for SILabs.
kareem-wolfssl Sep 22, 2025
0fcfade
Add missing aes NULL check to SI Labs wc_AesSetKey.
kareem-wolfssl Sep 23, 2025
3a4472f
Merge remote-tracking branch 'upstream/master' into zd20527
kareem-wolfssl Sep 25, 2025
14e1d2e
Merge branch 'master' into zd20527
kareem-wolfssl Oct 7, 2025
8fbc39e
Merge branch 'master' into zd20527
kareem-wolfssl Oct 7, 2025
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
6 changes: 3 additions & 3 deletions wolfcrypt/src/port/silabs/silabs_aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen,
return BUFFER_E;
}

XMEMSET(aes, 0, sizeof(*aes));

if (keylen > sizeof(aes->key)) {
if (aes == NULL || keylen > sizeof(aes->key)) {
return BAD_FUNC_ARG;
}

XMEMSET(aes, 0, sizeof(*aes));

ret = wc_AesSetIV(aes, iv);
aes->rounds = keylen/4 + 6;
aes->ctx.cmd_ctx = cc;
Expand Down
9 changes: 5 additions & 4 deletions wolfcrypt/src/sha512.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
!defined(WOLFSSL_QNX_CAAM)
/* functions defined in wolfcrypt/src/port/caam/caam_sha.c */

#elif defined(WOLFSSL_SILABS_SHA384)
#elif defined(WOLFSSL_SILABS_SHA512)
/* functions defined in wolfcrypt/src/port/silabs/silabs_hash.c */

#elif defined(WOLFSSL_KCAPI_HASH)
Expand Down Expand Up @@ -1211,7 +1211,7 @@ int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len)

#endif /* WOLFSSL_SHA512 */

#endif /* WOLFSSL_IMX6_CAAM || WOLFSSL_SILABS_SHA384 */
#endif /* WOLFSSL_IMX6_CAAM || WOLFSSL_SILABS_SHA512 */


#if defined(WOLFSSL_KCAPI_HASH)
Expand Down Expand Up @@ -1387,6 +1387,7 @@ static WC_INLINE int Sha512Final(wc_Sha512* sha512)
#elif defined(MAX3266X_SHA)
/* Functions defined in wolfcrypt/src/port/maxim/max3266x.c */
#elif defined(STM32_HASH_SHA512)
#elif defined(WOLFSSL_SILABS_SHA512)
#else

static int Sha512FinalRaw(wc_Sha512* sha512, byte* hash, word32 digestSz)
Expand Down Expand Up @@ -1630,7 +1631,7 @@ int wc_Sha512Transform(wc_Sha512* sha, const unsigned char* data)
return ret;
}

#elif defined(WOLFSSL_SILABS_SHA512)
#elif defined(WOLFSSL_SILABS_SHA384)
/* functions defined in wolfcrypt/src/port/silabs/silabs_hash.c */

#elif defined(WOLFSSL_KCAPI_HASH)
Expand Down Expand Up @@ -1895,7 +1896,7 @@ int wc_InitSha384_ex(wc_Sha384* sha384, void* heap, int devId)
return ret;
}

#endif /* WOLFSSL_IMX6_CAAM || WOLFSSL_SILABS_SHA512 || WOLFSSL_KCAPI_HASH */
#endif /* WOLFSSL_IMX6_CAAM || WOLFSSL_SILABS_SHA384 || WOLFSSL_KCAPI_HASH */

#if defined(MAX3266X_SHA)
/* Functions defined in wolfcrypt/src/port/maxim/max3266x.c */
Expand Down