From 6a1db27baebe7bb4d07e504864922aab4eaed789 Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Wed, 25 Mar 2026 17:59:18 +0100
Subject: [PATCH] Fix type casting for psk_keySz in MakePSKPreMasterSecret and
 initialize newSz in PKCS12_ConcatenateContent

---
 src/internal.c         | 2 +-
 wolfcrypt/src/pkcs12.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/internal.c b/src/internal.c
index 516f7ccc68..0a628ca473 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -31011,7 +31011,7 @@ static void MakePSKPreMasterSecret(Arrays* arrays, byte use_psk_key)
             XMEMSET(pms, 0, sz);
             pms += sz;
         }
-        c16toa(arrays->psk_keySz, pms);
+        c16toa((word16)arrays->psk_keySz, pms);
         pms += OPAQUE16_LEN;
         XMEMCPY(pms, arrays->psk_key, arrays->psk_keySz);
         arrays->preMasterSz = sz + arrays->psk_keySz + OPAQUE16_LEN * 2;
diff --git a/wolfcrypt/src/pkcs12.c b/wolfcrypt/src/pkcs12.c
index 5f00282f38..41e42c8b02 100644
--- a/wolfcrypt/src/pkcs12.c
+++ b/wolfcrypt/src/pkcs12.c
@@ -1147,7 +1147,7 @@ static byte* PKCS12_ConcatenateContent(WC_PKCS12* pkcs12,byte* mergedData,
 {
     byte* oldContent;
     word32 oldContentSz;
-    word32 newSz;
+    word32 newSz = 0;
 
     (void)pkcs12;