Zebediah Figura : cryptnet: Respect the timeout also if CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG is not set.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3a9d51bf36d9ced4792d4b5f731a2de6a370da7d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3a9d51bf36d9ced4792d4b5f7...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Thu Jul 22 00:21:05 2021 -0500

cryptnet: Respect the timeout also if CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG is not set.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/cryptnet/cryptnet_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c
index 565302957d6..f4088021a0e 100644
--- a/dlls/cryptnet/cryptnet_main.c
+++ b/dlls/cryptnet/cryptnet_main.c
@@ -1547,8 +1547,7 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB *
             if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION)
                 retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL;
 
-            if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && pRevPara
-                    && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout))
+            if (pRevPara && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout))
                 timeout = pRevPara->dwUrlRetrievalTimeout;
 
             /* Yes, this is a weird algorithm, but the documentation for
@@ -1577,7 +1576,7 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB *
                     /* We don't check the current time here. This may result in
                      * less accurate timeouts, but this too seems to be true of
                      * Windows. */
-                    if (GetLastError() == ERROR_TIMEOUT)
+                    if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && GetLastError() == ERROR_TIMEOUT)
                         timeout /= 2;
                     error = CRYPT_E_REVOCATION_OFFLINE;
                 }