Skip to content

Commit 7d36988

Browse files
committed
fix uninitialized enc in CAAM keygen
1 parent c8e0e23 commit 7d36988

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -772,17 +772,22 @@ int wc_CAAM_MakeEccKey(WC_RNG* rng, int keySize, ecc_key* key, int curveId,
772772
return CRYPTOCB_UNAVAILABLE;
773773
}
774774

775-
if (key->blackKey == CAAM_BLACK_KEY_ECB) {
775+
switch (key->blackKey) {
776+
case CAAM_BLACK_KEY_ECB:
776777
enc = CAAM_PKHA_ENC_PRI_AESECB;
777-
}
778-
779-
if (key->blackKey == 0) {
778+
break;
779+
case 0:
780780
#ifdef WOLFSSL_CAAM_NO_BLACK_KEY
781781
enc = 0;
782782
#else
783783
key->blackKey = CAAM_BLACK_KEY_ECB;
784784
enc = CAAM_PKHA_ENC_PRI_AESECB;
785785
#endif
786+
break;
787+
default:
788+
WOLFSSL_MSG("unknown/unsupported key type");
789+
ForceZero(k, sizeof(k));
790+
return BAD_FUNC_ARG;
786791
}
787792

788793
status = CAAM_ECC_Keygen(CAAM, &hndl, k, &kSz, xy, &xySz, ecdsel,

0 commit comments

Comments
 (0)