fix unreachable falcon level 5 detection

JeremiahM37 · JeremiahM37 · commit 9352fad4ac32 · 2026-04-29T13:56:17.000Z
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
@@ -9530,8 +9530,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;
@@ -9540,7 +9540,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;
@@ -9549,8 +9550,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,
                     WOLFSSL_MSG("Not Falcon Level 5 DER key");
                 }
             }
-            else {
-                WOLFSSL_MSG("GetKeyOID falcon initialization failed");
+            if (*algoID == 0) {
+                WOLFSSL_MSG("GetKeyOID could not match Falcon DER key");
             }
             wc_falcon_free(falcon);
         }

Original file line number	Diff line number	Diff line change
`@@ -9530,8 +9530,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,`
`9530`	`9530`	`return MEMORY_E;`
`9531`	`9531`
`9532`	`9532`	`if (wc_falcon_init(falcon) == 0) {`
`9533`		`- tmpIdx = 0;`
`9534`		`- if (wc_falcon_set_level(falcon, 1) == 0) {`
	`9533`	`+ if ((*algoID == 0) && (wc_falcon_set_level(falcon, 1) == 0)) {`
	`9534`	`+ tmpIdx = 0;`
`9535`	`9535`	`if (wc_Falcon_PrivateKeyDecode(key, &tmpIdx, falcon, keySz)`
`9536`	`9536`	`== 0) {`
`9537`	`9537`	`*algoID = FALCON_LEVEL1k;`
`@@ -9540,7 +9540,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,`
`9540`	`9540`	`WOLFSSL_MSG("Not Falcon Level 1 DER key");`
`9541`	`9541`	`}`
`9542`	`9542`	`}`
`9543`		`- else if (wc_falcon_set_level(falcon, 5) == 0) {`
	`9543`	`+ if ((*algoID == 0) && (wc_falcon_set_level(falcon, 5) == 0)) {`
	`9544`	`+ tmpIdx = 0;`
`9544`	`9545`	`if (wc_Falcon_PrivateKeyDecode(key, &tmpIdx, falcon, keySz)`
`9545`	`9546`	`== 0) {`
`9546`	`9547`	`*algoID = FALCON_LEVEL5k;`
`@@ -9549,8 +9550,8 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,`
`9549`	`9550`	`WOLFSSL_MSG("Not Falcon Level 5 DER key");`
`9550`	`9551`	`}`
`9551`	`9552`	`}`
`9552`		`- else {`
`9553`		`- WOLFSSL_MSG("GetKeyOID falcon initialization failed");`
	`9553`	`+ if (*algoID == 0) {`
	`9554`	`+ WOLFSSL_MSG("GetKeyOID could not match Falcon DER key");`
`9554`	`9555`	`}`
`9555`	`9556`	`wc_falcon_free(falcon);`
`9556`	`9557`	`}`