crypt32: Compare CRL's authority key identifier against the certificate's…

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

crypt32: Compare CRL's authority key identifier against the certificate's…
4df042b5 · Juan Lang · Alexandre Julliard · 1becda46 · 4df042b5
Commit 4df042b5 authored Dec 08, 2009 by Juan Lang Committed by Alexandre Julliard Dec 09, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 7 deletions

crl.c dlls/crypt32/crl.c +14 -7

No files found.
--- a/dlls/crypt32/crl.c
+++ b/dlls/crypt32/crl.c
@@ -167,14 +167,21 @@ static BOOL compare_crl_issued_by(PCCRL_CONTEXT pCrlContext, DWORD dwType,
                    }
                    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;
                        }