Rebase against c81c6fca50fcbd93fb54f4a3417630bb081578ff.

This commit is contained in:
Zebediah Figura
2024-04-25 16:57:40 -05:00
parent c5ff81413f
commit b682f11906
5 changed files with 26 additions and 51 deletions

View File

@@ -1,4 +1,4 @@
From 452d18312589f22e6dcfcba61b4901ae30537540 Mon Sep 17 00:00:00 2001
From 23c86326fda0da27cd7c876ba6a63ab05f23c299 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 18 Apr 2018 03:55:16 +0000
Subject: [PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
@@ -7,14 +7,14 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/wintrust/tests/softpub.c | 9 +++++++++
dlls/wintrust/wintrust_main.c | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c
index 77e15b2feb4..219fd8dc26f 100644
index 9654c296a78..44c92f91f08 100644
--- a/dlls/wintrust/tests/softpub.c
+++ b/dlls/wintrust/tests/softpub.c
@@ -1892,6 +1892,14 @@ static void test_multiple_signatures(void)
DeleteFileW(pathW);
@@ -1925,6 +1925,14 @@ static void test_pe_image_hash(void)
DeleteFileW(path);
}
+static void test_WTHelperGetProvCertFromChain(void)
@@ -28,18 +28,19 @@ index 77e15b2feb4..219fd8dc26f 100644
START_TEST(softpub)
{
InitFunctionPtrs();
@@ -1900,5 +1908,6 @@ START_TEST(softpub)
@@ -1933,6 +1941,7 @@ START_TEST(softpub)
test_wintrust();
test_wintrust_digest();
test_get_known_usages();
+ test_WTHelperGetProvCertFromChain();
test_multiple_signatures();
test_pe_image_hash();
}
diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c
index 925ae7ca85a..c48dbbfe2d8 100644
index a5c5706388a..8847115946a 100644
--- a/dlls/wintrust/wintrust_main.c
+++ b/dlls/wintrust/wintrust_main.c
@@ -786,7 +786,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain(
@@ -765,7 +765,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain(
TRACE("(%p %ld)\n", pSgnr, idxCert);
@@ -49,5 +50,5 @@ index 925ae7ca85a..c48dbbfe2d8 100644
cert = &pSgnr->pasCertChain[idxCert];
TRACE("returning %p\n", cert);
--
2.37.2
2.43.0