wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-05 13:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Complete pkcs7-data OID support for certificate subjects

Browse Source 
- Add WC_NID_pkcs7_data definition and OpenSSL compatibility macro
- Add pkcs7-data entry to wolfssl_object_info table for oidCertNameType recognition
- Add pkcs7-data case to get_dn_attr_by_nid for certificate subject display
- Add GetEntryByOID function for enhanced OID comparison in X509_NAME_get_index_by_OBJ
- Enables wolfCLU to show pkcs7-data field in certificate subjects like OpenSSL
- Supports both OID parsing during certificate loading and display formatting

Co-Authored-By: lealem@wolfssl.com <lealem@wolfssl.com>
This commit is contained in:
Devin AI
2025-07-22 19:43:07 +00:00
parent 9fe8f44bb2
commit 419db7b562
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ssl.c
View File

@@ -18617,6 +18617,7 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
{ WC_NID_userId, WC_NAME_USER_ID_OID, oidCertNameType, "UID", "userId"}, { WC_NID_userId, WC_NAME_USER_ID_OID, oidCertNameType, "UID", "userId"},
{ WC_NID_netscape_cert_type, NETSCAPE_CT_OID, oidCertNameType, { WC_NID_netscape_cert_type, NETSCAPE_CT_OID, oidCertNameType,
"nsCertType", "Netscape Cert Type"}, "nsCertType", "Netscape Cert Type"},
{ WC_NID_pkcs7_data, DATA, oidCertNameType, "pkcs7-data", "pkcs7-data"},
#if defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_NAME_ALL) #if defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_NAME_ALL)
{ WC_NID_pkcs9_challengePassword, CHALLENGE_PASSWORD_OID, { WC_NID_pkcs9_challengePassword, CHALLENGE_PASSWORD_OID,

4
src/x509.c
View File

@@ -13875,6 +13875,10 @@ static int get_dn_attr_by_nid(int n, const char** buf)
str = "mail"; str = "mail";
len = 4; len = 4;
break; break;
case WC_NID_pkcs7_data:
str = "pkcs7-data";
len = 10;
break;
default: default:
WOLFSSL_MSG("Attribute type not found"); WOLFSSL_MSG("Attribute type not found");
str = NULL; str = NULL;

2
wolfssl/wolfcrypt/asn.h
View File

@@ -912,6 +912,7 @@ extern const WOLFSSL_ObjectInfo wolfssl_object_info[];
#define WC_NID_pkcs7_signed 22 #define WC_NID_pkcs7_signed 22
#define WC_NID_pkcs7_enveloped 23 #define WC_NID_pkcs7_enveloped 23
#define WC_NID_pkcs7_signedAndEnveloped 24 #define WC_NID_pkcs7_signedAndEnveloped 24
#define WC_NID_pkcs7_data 26
#define WC_NID_pkcs9_emailAddress 48 #define WC_NID_pkcs9_emailAddress 48
#define WC_NID_pkcs9_unstructuredName 49 #define WC_NID_pkcs9_unstructuredName 49
#define WC_NID_pkcs9_contentType 50 /* 1.2.840.113549.1.9.3 */ #define WC_NID_pkcs9_contentType 50 /* 1.2.840.113549.1.9.3 */
@@ -988,6 +989,7 @@ extern const WOLFSSL_ObjectInfo wolfssl_object_info[];
#define NID_pkcs7_signed WC_NID_pkcs7_signed #define NID_pkcs7_signed WC_NID_pkcs7_signed
#define NID_pkcs7_enveloped WC_NID_pkcs7_enveloped #define NID_pkcs7_enveloped WC_NID_pkcs7_enveloped
#define NID_pkcs7_signedAndEnveloped WC_NID_pkcs7_signedAndEnveloped #define NID_pkcs7_signedAndEnveloped WC_NID_pkcs7_signedAndEnveloped
#define NID_pkcs7_data WC_NID_pkcs7_data
#define NID_pkcs9_unstructuredName WC_NID_pkcs9_unstructuredName #define NID_pkcs9_unstructuredName WC_NID_pkcs9_unstructuredName
#define NID_pkcs9_contentType WC_NID_pkcs9_contentType #define NID_pkcs9_contentType WC_NID_pkcs9_contentType
#define NID_pkcs9_challengePassword WC_NID_pkcs9_challengePassword #define NID_pkcs9_challengePassword WC_NID_pkcs9_challengePassword