From f4d9c90827a3265f00a7cab0b29c5c6c8a29760c Mon Sep 17 00:00:00 2001
From: Kareem <kareem@wolfssl.com>
Date: Fri, 19 Sep 2025 11:45:22 -0700
Subject: [PATCH 1/3] Fix swapped WOLFSSL_SILABS_SHA384/SHA512 defines in
 sha512.c.

---
 wolfcrypt/src/sha512.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c
index c2537c7a42d..43cc55a50e3 100644
--- a/wolfcrypt/src/sha512.c
+++ b/wolfcrypt/src/sha512.c
@@ -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)
@@ -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)
@@ -1632,7 +1632,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)
@@ -1897,7 +1897,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 */

From 1c7fe0632285ef45597fb13789b8b4d53a819a25 Mon Sep 17 00:00:00 2001
From: Kareem <kareem@wolfssl.com>
Date: Mon, 22 Sep 2025 15:45:37 -0700
Subject: [PATCH 2/3] Also gate out wc_Sha512Final for SILabs.

---
 wolfcrypt/src/sha512.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c
index 43cc55a50e3..17b3264aa1d 100644
--- a/wolfcrypt/src/sha512.c
+++ b/wolfcrypt/src/sha512.c
@@ -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)

From 0fcfade6a0a9f1ddb26d160981b8ea7dca229466 Mon Sep 17 00:00:00 2001
From: Kareem <kareem@wolfssl.com>
Date: Tue, 23 Sep 2025 10:16:47 -0700
Subject: [PATCH 3/3] Add missing aes NULL check to SI Labs wc_AesSetKey.

---
 wolfcrypt/src/port/silabs/silabs_aes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wolfcrypt/src/port/silabs/silabs_aes.c b/wolfcrypt/src/port/silabs/silabs_aes.c
index 652cec0e80d..6b9e0490901 100644
--- a/wolfcrypt/src/port/silabs/silabs_aes.c
+++ b/wolfcrypt/src/port/silabs/silabs_aes.c
@@ -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;