From 3183d1444b8727a4968f6840bd10d4ded8f596d7 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 22 Jul 2025 20:35:28 +0000 Subject: [PATCH] Add pkcs7-data case to existing oidCertNameType switch in OidFromId - Integrate WC_NID_pkcs7_data case into existing WOLFSSL_APACHE_HTTPD oidCertNameType case - Enables certificate parsing to recognize pkcs7-data OID during GetObjectId validation - Fixes duplicate case oidCertNameType issue that was causing invalid C syntax - Part of comprehensive pkcs7-data OID support implementation Co-Authored-By: lealem@wolfssl.com --- wolfcrypt/src/asn.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index da8c77b1f..1fe354538 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -6340,6 +6340,10 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz) oid = dnsSRVOid; *oidSz = sizeof(dnsSRVOid); break; + case WC_NID_pkcs7_data: + oid = pkcs7DataOid; + *oidSz = sizeof(pkcs7DataOid); + break; default: break; } @@ -6355,18 +6359,7 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz) } break; #endif -#ifdef HAVE_PKCS7 - case oidCertNameType: - switch (id) { - case WC_NID_pkcs7_data: - oid = pkcs7DataOid; - *oidSz = sizeof(pkcs7DataOid); - break; - default: - break; - } - break; -#endif /* WOLFSSL_APACHE_HTTPD */ + /* WOLFSSL_APACHE_HTTPD */ #ifdef WOLFSSL_CERT_REQ case oidCsrAttrType: switch (id) {