Skip to content

Fix FIPS v6 or older build with crypto callbacks and SHA512 #10557

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
douzzer merged 1 commit into from
Jun 1, 2026
+16 −2
Merged

Fix FIPS v6 or older build with crypto callbacks and SHA512 #10557

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
12 changes: 11 additions & 1 deletion wolfcrypt/src/cryptocb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2033,10 +2033,20 @@ int wc_CryptoCb_Sha384Hash(wc_Sha384* sha384, const byte* in,

#ifdef WOLFSSL_SHA512
int wc_CryptoCb_Sha512Hash(wc_Sha512* sha512, const byte* in,
word32 inSz, byte* digest, size_t digestSz)
word32 inSz, byte* digest
#if !(defined(HAVE_FIPS) && FIPS_VERSION_LT(7,0))
, size_t digestSz
#endif
)
{
int ret = WC_NO_ERR_TRACE(CRYPTOCB_UNAVAILABLE);
CryptoCb* dev;
#if defined(HAVE_FIPS) && FIPS_VERSION_LT(7,0)
/* Older FIPS sha512.c snapshots call the 4-arg API (no digestSz). Treat as
* full-size SHA-512 with no variant dispatch, matching pre-digestSz
* behavior. */
size_t digestSz = WC_SHA512_DIGEST_SIZE;
#endif

/* locate registered callback */
#ifndef NO_SHA2_CRYPTO_CB
Expand Down
6 changes: 5 additions & 1 deletion wolfssl/wolfcrypt/cryptocb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,11 @@ WOLFSSL_LOCAL int wc_CryptoCb_Sha384Hash(wc_Sha384* sha384, const byte* in,
#endif
#ifdef WOLFSSL_SHA512
WOLFSSL_LOCAL int wc_CryptoCb_Sha512Hash(wc_Sha512* sha512, const byte* in,
word32 inSz, byte* digest, size_t digestSz);
word32 inSz, byte* digest
#if !(defined(HAVE_FIPS) && FIPS_VERSION_LT(7,0))
, size_t digestSz
#endif
);
#endif

#ifdef WOLFSSL_SHA3
Expand Down
Loading