From 7d369889f72eb5bc1d6fb0cbb66802e67744593d Mon Sep 17 00:00:00 2001 From: Jeremiah Mackey Date: Thu, 26 Mar 2026 16:36:36 +0000 Subject: [PATCH] fix uninitialized enc in CAAM keygen --- wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c b/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c index 64841f9630..9a5bbeb2d5 100644 --- a/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c +++ b/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c @@ -772,17 +772,22 @@ int wc_CAAM_MakeEccKey(WC_RNG* rng, int keySize, ecc_key* key, int curveId, return CRYPTOCB_UNAVAILABLE; } - if (key->blackKey == CAAM_BLACK_KEY_ECB) { + switch (key->blackKey) { + case CAAM_BLACK_KEY_ECB: enc = CAAM_PKHA_ENC_PRI_AESECB; - } - - if (key->blackKey == 0) { + break; + case 0: #ifdef WOLFSSL_CAAM_NO_BLACK_KEY enc = 0; #else key->blackKey = CAAM_BLACK_KEY_ECB; enc = CAAM_PKHA_ENC_PRI_AESECB; #endif + break; + default: + WOLFSSL_MSG("unknown/unsupported key type"); + ForceZero(k, sizeof(k)); + return BAD_FUNC_ARG; } status = CAAM_ECC_Keygen(CAAM, &hndl, k, &kSz, xy, &xySz, ecdsel,