Fixes Falcon else-if chain key detection

anhu · anhu · commit 3b36db0c9d8e · 2026-03-16T10:55:28.000-04:00
F-750
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
@@ -9582,8 +9582,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,
             return MEMORY_E;
 
         if (wc_falcon_init(falcon) == 0) {
-            tmpIdx = 0;
-            if (wc_falcon_set_level(falcon, 1) == 0) {
+            if ((*algoID == 0) && (wc_falcon_set_level(falcon, 1) == 0)) {
+                tmpIdx = 0;
                 if (wc_Falcon_PrivateKeyDecode(key, &tmpIdx, falcon, keySz)
                     == 0) {
                     *algoID = FALCON_LEVEL1k;
@@ -9592,7 +9592,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,
                     WOLFSSL_MSG("Not Falcon Level 1 DER key");
                 }
             }
-            else if (wc_falcon_set_level(falcon, 5) == 0) {
+            if ((*algoID == 0) && (wc_falcon_set_level(falcon, 5) == 0)) {
+                tmpIdx = 0;
                 if (wc_Falcon_PrivateKeyDecode(key, &tmpIdx, falcon, keySz)
                     == 0) {
                     *algoID = FALCON_LEVEL5k;
@@ -9601,7 +9602,7 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,
                     WOLFSSL_MSG("Not Falcon Level 5 DER key");
                 }
             }
-            else {
+            if (*algoID == 0) {
                 WOLFSSL_MSG("GetKeyOID falcon initialization failed");
             }
             wc_falcon_free(falcon);

Original file line number	Diff line number	Diff line change
`@@ -9582,8 +9582,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,`
`9582`	`9582`	`return MEMORY_E;`
`9583`	`9583`
`9584`	`9584`	`if (wc_falcon_init(falcon) == 0) {`
`9585`		`- tmpIdx = 0;`
`9586`		`- if (wc_falcon_set_level(falcon, 1) == 0) {`
	`9585`	`+ if ((*algoID == 0) && (wc_falcon_set_level(falcon, 1) == 0)) {`
	`9586`	`+ tmpIdx = 0;`
`9587`	`9587`	`if (wc_Falcon_PrivateKeyDecode(key, &tmpIdx, falcon, keySz)`
`9588`	`9588`	`== 0) {`
`9589`	`9589`	`*algoID = FALCON_LEVEL1k;`
`@@ -9592,7 +9592,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,`
`9592`	`9592`	`WOLFSSL_MSG("Not Falcon Level 1 DER key");`
`9593`	`9593`	`}`
`9594`	`9594`	`}`
`9595`		`- else if (wc_falcon_set_level(falcon, 5) == 0) {`
	`9595`	`+ if ((*algoID == 0) && (wc_falcon_set_level(falcon, 5) == 0)) {`
	`9596`	`+ tmpIdx = 0;`
`9596`	`9597`	`if (wc_Falcon_PrivateKeyDecode(key, &tmpIdx, falcon, keySz)`
`9597`	`9598`	`== 0) {`
`9598`	`9599`	`*algoID = FALCON_LEVEL5k;`
`@@ -9601,7 +9602,7 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,`
`9601`	`9602`	`WOLFSSL_MSG("Not Falcon Level 5 DER key");`
`9602`	`9603`	`}`
`9603`	`9604`	`}`
`9604`		`- else {`
	`9605`	`+ if (*algoID == 0) {`
`9605`	`9606`	`WOLFSSL_MSG("GetKeyOID falcon initialization failed");`
`9606`	`9607`	`}`
`9607`	`9608`	`wc_falcon_free(falcon);`