wolfcrypt/src/ecc.c: in wc_ecc_get_curve_id_from_oid(), deconditionalize guard against zero-length len added in 03a6eed, to fix test_wc_ecc_get_curve_id_from_oid() failing in cross-mingw-all-crypto.

douzzer · douzzer · commit bffcfb7efc22 · 2024-10-23T00:02:29.000-05:00
diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
@@ -4554,13 +4554,11 @@ int wc_ecc_get_curve_id_from_oid(const byte* oid, word32 len)
     }
 #endif
 
-#if !defined(HAVE_OID_ENCODING) && !defined(HAVE_OID_DECODING)
     if (len == 0) {
         /* SAKKE has zero oidSz and will otherwise match with len==0. */
         WOLFSSL_MSG("zero oidSz");
         return ECC_CURVE_INVALID;
     }
-#endif
 
     for (curve_idx = 0; ecc_sets[curve_idx].size != 0; curve_idx++) {
     #if defined(HAVE_OID_ENCODING) && !defined(HAVE_OID_DECODING)

Original file line number	Diff line number	Diff line change
`@@ -4554,13 +4554,11 @@ int wc_ecc_get_curve_id_from_oid(const byte* oid, word32 len)`
`4554`	`4554`	`}`
`4555`	`4555`	`#endif`
`4556`	`4556`
`4557`		`-#if !defined(HAVE_OID_ENCODING) && !defined(HAVE_OID_DECODING)`
`4558`	`4557`	`if (len == 0) {`
`4559`	`4558`	`/* SAKKE has zero oidSz and will otherwise match with len==0. */`
`4560`	`4559`	`WOLFSSL_MSG("zero oidSz");`
`4561`	`4560`	`return ECC_CURVE_INVALID;`
`4562`	`4561`	`}`
`4563`		`-#endif`
`4564`	`4562`
`4565`	`4563`	`for (curve_idx = 0; ecc_sets[curve_idx].size != 0; curve_idx++) {`
`4566`	`4564`	`#if defined(HAVE_OID_ENCODING) && !defined(HAVE_OID_DECODING)`