Skip to content

Fix missing header includes and conditional compilation issue for PSoC6 port. #9776

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 1 commit into from
Feb 17, 2026
Merged

Fix missing header includes and conditional compilation issue for PSoC6 port. #9776

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
22 changes: 18 additions & 4 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 @@ -36,10 +36,10 @@
#include <stdint.h>
#include <string.h>

#include <wolfssl/wolfcrypt/port/cypress/psoc6_crypto.h>
#include <wolfssl/wolfcrypt/random.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/port/cypress/psoc6_crypto.h>
#include <wolfssl/wolfcrypt/random.h>

#include "cy_crypto_core_hw_v2.h"
#include "cy_crypto_core_mem.h"
Expand All @@ -54,9 +54,20 @@
#include "cy_crypto_common.h"
#include "cy_crypto_core_aes.h"
#include "cy_crypto_core_aes_v2.h"

#endif /* NO_AES */

#ifndef NO_SHA256
#include "wolfssl/wolfcrypt/sha256.h"
#endif

#ifdef WOLFSSL_SHA3
#include "wolfssl/wolfcrypt/sha3.h"
#endif

#if defined(WOLFSSL_SHA512) || defined(WOLFSSL_SHA384)
#include "wolfssl/wolfcrypt/sha512.h"
#endif

#if defined(PSOC6_HASH_SHA3)

/* Number of bits in a byte */
Expand Down Expand Up @@ -1102,7 +1113,10 @@ int wc_Psoc6_Aes_SetKey(Aes* aes, const byte* userKey, word32 len,
/* Store key information in wolfSSL structure */
aes->keylen = len;
aes->rounds = len / 4 + 6;
aes->left = 0;

#if defined(WOLFSSL_AES_CFB)
aes->left = 0;
#endif

XMEMCPY(aes->key, userKey, len);

Expand Down