Merge pull request #10440 from JeremiahM37/gh10423

fix NO_VERIFY_OID build in GetOID

.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'

wolfcrypt/src/asn.c

@@ -7616,9 +7616,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 */
@@ -7630,11 +7630,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;