Skip to content

fix NO_VERIFY_OID build in GetOID #10440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JeremiahM37 wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −4
Open

fix NO_VERIFY_OID build in GetOID #10440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3c19f
fix NO_VERIFY_OID build in GetOID
JeremiahM37 May 8, 2026
56461a8
ci: add NO_VERIFY_OID os-check matrix entries
JeremiahM37 May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/os-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,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'
Expand Down
6 changes: 2 additions & 4 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand Down
Loading