cryptnet: Use helper function to verify a certificate's revocation.

dlls/cryptnet/cryptnet_main.c

@@ -1544,75 +1544,19 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid,
     return ret;
 }
 
-typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS {
-    DWORD                     cbSize;
-    PCCERT_CONTEXT            pIssuerCert;
-    DWORD                     cCertStore;
-    HCERTSTORE               *rgCertStore;
-    HCERTSTORE                hCrlStore;
-    LPFILETIME                pftTimeToUse;
-} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS, *PCERT_REVOCATION_PARA_NO_EXTRA_FIELDS;
-
-typedef struct _OLD_CERT_REVOCATION_STATUS {
-    DWORD cbSize;
-    DWORD dwIndex;
-    DWORD dwError;
-    DWORD dwReason;
-} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS;
-
-/***********************************************************************
- *    CertDllVerifyRevocation (CRYPTNET.@)
- */
-BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
- DWORD cContext, PVOID rgpvContext[], DWORD dwFlags,
- PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus)
+static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index,
+ FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara,
+ PCERT_REVOCATION_STATUS pRevStatus)
 {
-    DWORD error = 0, i;
     BOOL ret;
-    FILETIME now;
-    LPFILETIME pTime = NULL;
-
-    TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType,
-     cContext, rgpvContext, dwFlags, pRevPara, pRevStatus);
+    DWORD error = ERROR_SUCCESS, cbUrlArray;
 
-    if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) &&
-     pRevStatus->cbSize != sizeof(CERT_REVOCATION_STATUS))
-    {
-        SetLastError(E_INVALIDARG);
-        return FALSE;
-    }
-    if (!cContext)
-    {
-        SetLastError(E_INVALIDARG);
-        return FALSE;
-    }
-    if (pRevPara && pRevPara->cbSize >=
-     sizeof(CERT_REVOCATION_PARA_NO_EXTRA_FIELDS))
-        pTime = pRevPara->pftTimeToUse;
-    if (!pTime)
-    {
-        GetSystemTimeAsFileTime(&now);
-        pTime = &now;
-    }
-    memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD));
-    if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE)
-    {
-        error = CRYPT_E_NO_REVOCATION_CHECK;
-        ret = FALSE;
-    }
-    else
-    {
-        ret = TRUE;
-        for (i = 0; ret && i < cContext; i++)
-        {
-            DWORD cbUrlArray;
-
-            ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT,
-             rgpvContext[i], 0, NULL, &cbUrlArray, NULL, NULL, NULL);
+    ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, (void *)cert,
+     0, NULL, &cbUrlArray, NULL, NULL, NULL);
     if (!ret && GetLastError() == CRYPT_E_NOT_FOUND)
     {
         error = CRYPT_E_NO_REVOCATION_CHECK;
-                pRevStatus->dwIndex = i;
+        pRevStatus->dwIndex = index;
     }
     else if (ret)
     {
@@ -1623,13 +1567,11 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
             DWORD j, retrievalFlags = 0, startTime, endTime, timeout;
 
             ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT,
-                     rgpvContext[i], 0, urlArray, &cbUrlArray, NULL, NULL,
-                     NULL);
+             (void *)cert, 0, urlArray, &cbUrlArray, NULL, NULL, NULL);
             if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION)
                 retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL;
-                    if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) &&
-                     pRevPara &&
-                     pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA,
+            if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG &&
+             pRevPara && pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA,
              dwUrlRetrievalTimeout) + sizeof(DWORD))
             {
                 startTime = GetTickCount();
@@ -1643,8 +1585,8 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
                 PCCRL_CONTEXT crl;
 
                 ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j],
-                         CONTEXT_OID_CRL, retrievalFlags, timeout,
-                         (void **)&crl, NULL, NULL, NULL, NULL);
+                 CONTEXT_OID_CRL, retrievalFlags, timeout, (void **)&crl,
+                 NULL, NULL, NULL, NULL);
                 if (ret)
                 {
                     if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo))
@@ -1657,13 +1599,11 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
                     {
                         PCRL_ENTRY entry = NULL;
 
-                                CertFindCertificateInCRL(
-                                 rgpvContext[i], crl, 0, NULL,
-                                 &entry);
+                        CertFindCertificateInCRL(cert, crl, 0, NULL, &entry);
                         if (entry)
                         {
                             error = CRYPT_E_REVOKED;
-                                    pRevStatus->dwIndex = i;
+                            pRevStatus->dwIndex = index;
                             ret = FALSE;
                         }
                     }
@@ -1674,7 +1614,7 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
                         if ((int)(endTime - time) <= 0)
                         {
                             error = ERROR_TIMEOUT;
-                                    pRevStatus->dwIndex = i;
+                            pRevStatus->dwIndex = index;
                             ret = FALSE;
                         }
                         else
@@ -1690,19 +1630,81 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
         else
         {
             error = ERROR_OUTOFMEMORY;
-                    pRevStatus->dwIndex = i;
-                    ret = FALSE;
+            pRevStatus->dwIndex = index;
         }
     }
     else
-                pRevStatus->dwIndex = i;
-        }
+    {
+        error = GetLastError();
+        pRevStatus->dwIndex = index;
     }
+    return error;
+}
 
-    if (!ret)
+typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS {
+    DWORD                     cbSize;
+    PCCERT_CONTEXT            pIssuerCert;
+    DWORD                     cCertStore;
+    HCERTSTORE               *rgCertStore;
+    HCERTSTORE                hCrlStore;
+    LPFILETIME                pftTimeToUse;
+} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS, *PCERT_REVOCATION_PARA_NO_EXTRA_FIELDS;
+
+typedef struct _OLD_CERT_REVOCATION_STATUS {
+    DWORD cbSize;
+    DWORD dwIndex;
+    DWORD dwError;
+    DWORD dwReason;
+} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS;
+
+/***********************************************************************
+ *    CertDllVerifyRevocation (CRYPTNET.@)
+ */
+BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
+ DWORD cContext, PVOID rgpvContext[], DWORD dwFlags,
+ PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus)
+{
+    DWORD error = 0, i;
+    BOOL ret;
+    FILETIME now;
+    LPFILETIME pTime = NULL;
+
+    TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType,
+     cContext, rgpvContext, dwFlags, pRevPara, pRevStatus);
+
+    if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) &&
+     pRevStatus->cbSize != sizeof(CERT_REVOCATION_STATUS))
+    {
+        SetLastError(E_INVALIDARG);
+        return FALSE;
+    }
+    if (!cContext)
+    {
+        SetLastError(E_INVALIDARG);
+        return FALSE;
+    }
+    if (pRevPara && pRevPara->cbSize >=
+     sizeof(CERT_REVOCATION_PARA_NO_EXTRA_FIELDS))
+        pTime = pRevPara->pftTimeToUse;
+    if (!pTime)
+    {
+        GetSystemTimeAsFileTime(&now);
+        pTime = &now;
+    }
+    memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD));
+    if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE)
+        error = CRYPT_E_NO_REVOCATION_CHECK;
+    else
+    {
+        for (i = 0; !error && i < cContext; i++)
+            error = verify_cert_revocation(rgpvContext[i], i, pTime, dwFlags,
+             pRevPara, pRevStatus);
+    }
+    if (error)
     {
         SetLastError(error);
         pRevStatus->dwError = error;
+        ret = FALSE;
     }
     TRACE("returning %d (%08x)\n", ret, error);
     return ret;