Skip to content

fix for CAAM build #10459

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

Open
JacobBarthelmeh wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −6
Open

fix for CAAM build #10459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e33dd33
fix for CAAM build
JacobBarthelmeh May 11, 2026
8c552e3
fix for const pointer with internal CAAM function
JacobBarthelmeh May 12, 2026
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: 6 additions & 6 deletions wolfcrypt/src/port/caam/wolfcaam_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
****************************************************************************/

#ifndef WOLFSSL_HASH_KEEP
static int _ShaUpdate(byte* buffer, word32* buffLen, const byte* ctx,
static int _ShaUpdate(byte* buffer, word32* buffLen, byte* ctx,
const byte* data, word32 len, word32 digestSz, word32 type)
{
CAAM_BUFFER buf[2];
Expand All @@ -92,7 +92,7 @@ static int _ShaUpdate(byte* buffer, word32* buffLen, const byte* ctx,
if (*buffLen == WC_CAAM_HASH_BLOCK) {
/* Set buffer for context */
buf[idx].BufferType = DataBuffer;
buf[idx].TheAddress = (CAAM_ADDRESS)sha->ctx;
buf[idx].TheAddress = (CAAM_ADDRESS)ctx;
buf[idx].Length = digestSz + WC_CAAM_CTXLEN;
Comment thread
JacobBarthelmeh marked this conversation as resolved.
#if defined(__INTEGRITY) || defined(INTEGRITY)
buf[idx].Transferred = 0;
Expand All @@ -101,7 +101,7 @@ static int _ShaUpdate(byte* buffer, word32* buffLen, const byte* ctx,

/* data to update with */
buf[idx].BufferType = DataBuffer | LastBuffer;
buf[idx].TheAddress = (CAAM_ADDRESS)sha->buffer;
buf[idx].TheAddress = (CAAM_ADDRESS)buffer;
buf[idx].Length = *buffLen;
#if defined(__INTEGRITY) || defined(INTEGRITY)
buf[idx].Transferred = 0;
Expand All @@ -127,7 +127,7 @@ static int _ShaUpdate(byte* buffer, word32* buffLen, const byte* ctx,

/* Set buffer for context */
buf[idx].BufferType = DataBuffer;
buf[idx].TheAddress = (CAAM_ADDRESS)sha->ctx;
buf[idx].TheAddress = (CAAM_ADDRESS)ctx;
buf[idx].Length = digestSz + WC_CAAM_CTXLEN;
#if defined(__INTEGRITY) || defined(INTEGRITY)
buf[idx].Transferred = 0;
Expand Down Expand Up @@ -262,7 +262,7 @@ int wc_CAAM_Sha224Hash(wc_Sha224* sha224, const byte* in, word32 inSz,
#ifdef WOLFSSL_HASH_KEEP
ret = wc_Sha224_Grow(sha224, in, inSz);
#else
ret = _ShaUpdate(sha224->buffer, &sha224->bufferLen,
ret = _ShaUpdate((byte*)sha224->buffer, &sha224->buffLen,
(byte*)sha224->digest, in, inSz, SHA224_DIGEST_SIZE, CAAM_SHA224);
#endif
}
Expand All @@ -278,7 +278,7 @@ int wc_CAAM_Sha224Hash(wc_Sha224* sha224, const byte* in, word32 inSz,
wc_InitSha224_ex(sha224, heap, devId);
#else
ret = _ShaFinal((byte*)sha224->digest, SHA224_DIGEST_SIZE,
(byte*)sha224->buffer, sha224->bufferLen, digest, CAAM_SHA224);
(byte*)sha224->buffer, sha224->buffLen, digest, CAAM_SHA224);
#endif
}
return ret;
Expand Down
Loading