crypt32: Accept either the subject alt name 2 or subject alt name extensions,…

crypt32: Accept either the subject alt name 2 or subject alt name extensions, and prefer the former when both are present.

crypt32: Accept either the subject alt name 2 or subject alt name extensions,…
6a575d69 · Juan Lang · Alexandre Julliard · 1e953ef1 · 6a575d69
Commit 6a575d69 authored Oct 23, 2009 by Juan Lang Committed by Alexandre Julliard Oct 29, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

chain.c dlls/crypt32/chain.c +8 -2

No files found.
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -618,8 +618,12 @@ static void CRYPT_CheckNameConstraints(
    {
        CERT_EXTENSION *ext;

-        if ((ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, cert->cExtension,
-         cert->rgExtension)))
+        ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, cert->cExtension,
+         cert->rgExtension);
+        if (!ext)
+            ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, cert->cExtension,
+             cert->rgExtension);
+        if (ext)
        {
            CERT_ALT_NAME_INFO *subjectName;
            DWORD size;
@@ -1088,6 +1092,8 @@ static BOOL CRYPT_CriticalExtensionsSupported(PCCERT_CONTEXT cert)
                ret = TRUE;
            else if (!strcmp(oid, szOID_SUBJECT_ALT_NAME))
                ret = TRUE;
+            else if (!strcmp(oid, szOID_SUBJECT_ALT_NAME2))
+                ret = TRUE;
            else
            {
                FIXME("unsupported critical extension %s\n",