Juan Lang : crypt32: Apply name constraints to subject name.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e4c03521accd128a3f4d70519116879e00bde1e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e4c03521accd128a3f4d705191...

Author: Juan Lang <juan.lang(a)gmail.com>
Date:   Tue Nov 17 13:33:35 2009 -0800

crypt32: Apply name constraints to subject name.

---

 dlls/crypt32/chain.c |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c
index 14e716a..0d9a66d 100644
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -865,6 +865,36 @@ static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt,
          CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS;
 }
 
+static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName,
+ const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus)
+{
+    DWORD i;
+
+    for (i = 0; i < nameConstraints->cExcludedSubtree; i++)
+    {
+        CERT_ALT_NAME_ENTRY *constraint =
+         &nameConstraints->rgExcludedSubtree[i].Base;
+
+        if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME &&
+         directory_name_matches(&constraint->u.DirectoryName, subjectName))
+            *trustErrorStatus |=
+             CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT;
+    }
+    for (i = 0; i < nameConstraints->cPermittedSubtree; i++)
+    {
+        CERT_ALT_NAME_ENTRY *constraint =
+         &nameConstraints->rgPermittedSubtree[i].Base;
+
+        if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME)
+        {
+            if (!directory_name_matches(&constraint->u.DirectoryName,
+             subjectName))
+                *trustErrorStatus |=
+                 CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT;
+        }
+    }
+}
+
 static void CRYPT_CheckNameConstraints(
  const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert,
  DWORD *trustErrorStatus)
@@ -874,15 +904,13 @@ static void CRYPT_CheckNameConstraints(
     if (ext)
         compare_alt_name_with_constraints(ext, nameConstraints,
          trustErrorStatus);
-    else
-    {
-        if (nameConstraints->cPermittedSubtree)
-            *trustErrorStatus |=
-             CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
-             CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT;
-        if (nameConstraints->cExcludedSubtree)
-            *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT;
-    }
+    /* Name constraints apply to the subject alternative name as well as the
+     * subject name.  From RFC 5280, section 4.2.1.10:
+     * "Restrictions apply to the subject distinguished name and apply to
+     *  subject alternative names."
+     */
+    compare_subject_with_constraints(&cert->Subject, nameConstraints,
+     trustErrorStatus);
 }
 
 /* Gets cert's name constraints, if any.  Free with LocalFree. */