From 76b48f8fc44eb3540d1cbe6ebc8849f3250d5789 Mon Sep 17 00:00:00 2001 From: Jeremiah Mackey Date: Fri, 8 May 2026 17:04:35 +0000 Subject: [PATCH 1/2] fix NO_VERIFY_OID build in GetOID --- wolfcrypt/src/asn.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 1d9882870f..ad7a078a2e 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -7609,9 +7609,9 @@ static int GetOID(const byte* input, word32* inOutIdx, word32* oid, { int ret = 0; word32 idx = *inOutIdx; -#ifndef NO_VERIFY_OID word32 actualOidSz; const byte* actualOid; +#ifndef NO_VERIFY_OID const byte* checkOid = NULL; word32 checkOidSz; #endif /* NO_VERIFY_OID */ @@ -7623,11 +7623,9 @@ static int GetOID(const byte* input, word32* inOutIdx, word32* oid, (void)oidType; *oid = 0; -#if !defined(NO_VERIFY_OID) || defined(WOLFSSL_FPKI) - /* Keep references to OID data and length for check. */ + /* Keep references to OID data and length for sum and (optional) check. */ actualOid = &input[idx]; actualOidSz = (word32)length; -#endif /* NO_VERIFY_OID */ *oid = wc_oid_sum(actualOid, (int)actualOidSz); idx += actualOidSz; From cb1f8002dfbf36dcb7b127e1571364ad1b7e85d0 Mon Sep 17 00:00:00 2001 From: JeremiahM37 Date: Fri, 8 May 2026 14:43:35 -0600 Subject: [PATCH 2/2] ci: add NO_VERIFY_OID os-check matrix entries --- .github/workflows/os-check.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml index 917d6e94fa..39b4c65585 100644 --- a/.github/workflows/os-check.yml +++ b/.github/workflows/os-check.yml @@ -128,6 +128,8 @@ jobs: CPPFLAGS=''-DNO_WOLFSSL_SERVER -DWOLFSSL_NO_TLS12 -DNO_SESSION_CACHE -DWOLFSSL_AES_NO_UNROLL -DUSE_SLOW_SHA256 -DWOLFSSL_NO_ASYNC_IO -DWOLFSSL_DTLS_ONLY'' ', + 'CPPFLAGS=-DNO_VERIFY_OID', + 'CPPFLAGS="-DNO_VERIFY_OID -DWOLFSSL_FPKI"', ] name: make check linux if: github.repository_owner == 'wolfssl'