commit 4df042b54bae0159a5b8216b4bb2a59dfc561dec
author Juan Lang <juan.lang@gmail.com> Tue Dec 08 10:18:27 2009 -0800
committer Alexandre Julliard <julliard@winehq.org> Wed Dec 09 12:02:43 2009 +0100
tree 3ad0e0fa5f2147b6cbf4dca50db23f69726a7063
parent 1becda464de4a12e66cfc4128fffd6de9044cb0c

crypt32: Compare CRL's authority key identifier against the certificate's subject key identifier property, which also decodes the certificate's extension if necessary.

dlls/crypt32/crl.c

diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c
index a24e6ad..72180c5 100644
--- a/dlls/crypt32/crl.c
+++ b/dlls/crypt32/crl.c
@@ -167,14 +167,21 @@
                     }
                     else if (info->KeyId.cbData)
                     {
-                        if ((ext = CertFindExtension(
-                         szOID_SUBJECT_KEY_IDENTIFIER,
-                         issuer->pCertInfo->cExtension,
-                         issuer->pCertInfo->rgExtension)))
+                        DWORD size;
+
+                        ret = CertGetCertificateContextProperty(issuer,
+                         CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size);
+                        if (ret && size == info->KeyId.cbData)
                         {
-                            if (info->KeyId.cbData == ext->Value.cbData)
-                                ret = !memcmp(info->KeyId.pbData,
-                                 ext->Value.pbData, info->KeyId.cbData);
+                            LPBYTE buf = CryptMemAlloc(size);
+
+                            if (buf)
+                            {
+                                CertGetCertificateContextProperty(issuer,
+                                 CERT_KEY_IDENTIFIER_PROP_ID, buf, &size);
+                                ret = !memcmp(buf, info->KeyId.pbData, size);
+                                CryptMemFree(buf);
+                            }
                             else
                                 ret = FALSE;
                         }