crypt32: Add some CertGetNameStringW fallback cases.

When called with CERT_NAME_ATTR_TYPE and pvTypePara=NULL, Windows did the first of email, CN, OU, or O while Wine just did email.

crypt32: Add some CertGetNameStringW fallback cases.
01c69eb3 · Tyson Whitehead · Alexandre Julliard · 78dc4ce7 · 01c69eb3
Commit 01c69eb3 authored Mar 14, 2023 by Tyson Whitehead Committed by Alexandre Julliard Mar 20, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 4 deletions

str.c dlls/crypt32/str.c +15 -4

No files found.
--- a/dlls/crypt32/str.c
+++ b/dlls/crypt32/str.c
@@ -965,11 +965,22 @@ static DWORD cert_get_name_from_rdn_attr(DWORD encodingType,
    if (CryptDecodeObjectEx(encodingType, X509_NAME, name->pbData,
     name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes))
    {
-        PCERT_RDN_ATTR nameAttr;
+        PCERT_RDN_ATTR nameAttr = NULL;

-        if (!oid)
-            oid = szOID_RSA_emailAddr;
-        nameAttr = CertFindRDNAttr(oid, nameInfo);
+        if (oid)
+            nameAttr = CertFindRDNAttr(oid, nameInfo);
+        else
+        {
+            static const LPCSTR attributeOIDs[] =
+            {
+                szOID_RSA_emailAddr, szOID_COMMON_NAME,
+                szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME
+            };
+            DWORD i;
+
+            for (i = 0; !nameAttr && i < ARRAY_SIZE(attributeOIDs); i++)
+                nameAttr = CertFindRDNAttr(attributeOIDs[i], nameInfo);
+        }
        if (nameAttr)
            ret = rdn_value_to_strW(nameAttr->dwValueType, &nameAttr->Value,
             pszNameString, cchNameString, TRUE);