From 73ddc666c65f46bc32d4e4d99078827e527f0ff2 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 24 Sep 2017 11:18:27 +0000 Subject: [PATCH] [WINTRUST] Sync with Wine Staging 2.16. CORE-13762 59a476e wintrust: use enhanced crypto provider in VerifyImageHash 9369e80 wintrust: Increase buffer size to silence a gcc warning. svn path=/trunk/; revision=75949 --- reactos/dll/win32/wintrust/asn.c | 4 ++-- reactos/dll/win32/wintrust/softpub.c | 2 +- reactos/media/doc/README.WINE | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/wintrust/asn.c b/reactos/dll/win32/wintrust/asn.c index c0e416b5e55..67dbf8be631 100644 --- a/reactos/dll/win32/wintrust/asn.c +++ b/reactos/dll/win32/wintrust/asn.c @@ -1830,10 +1830,10 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, /* The largest possible string for the first two components * is 2.175 (= 2 * 40 + 175 = 255), so this is big enough. */ - char firstTwo[6]; + char firstTwo[8]; const BYTE *ptr; - snprintf(firstTwo, sizeof(firstTwo), "%d.%d", + sprintf(firstTwo, "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40); diff --git a/reactos/dll/win32/wintrust/softpub.c b/reactos/dll/win32/wintrust/softpub.c index f856c78f0f8..c70a19f5d28 100644 --- a/reactos/dll/win32/wintrust/softpub.c +++ b/reactos/dll/win32/wintrust/softpub.c @@ -339,7 +339,7 @@ static DWORD SOFTPUB_VerifyImageHash(CRYPT_PROVIDER_DATA *data, HANDLE file) if (!prov) { - if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&prov, NULL, MS_ENH_RSA_AES_PROV_W, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) return GetLastError(); release_prov = TRUE; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index d66d9dff116..c3f11e3a1d0 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -206,7 +206,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-2.9 -reactos/dll/win32/wintrust # Synced to WineStaging-2.9 +reactos/dll/win32/wintrust # Synced to WineStaging-2.16 reactos/dll/win32/wldap32 # Synced to WineStaging-2.9 reactos/dll/win32/wmi # Synced to WineStaging-2.9 reactos/dll/win32/wmiutils # Synced to WineStaging-2.9