[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
This commit is contained in:
Amine Khaldi 2017-09-24 11:18:27 +00:00
parent f1c2481230
commit 73ddc666c6
3 changed files with 4 additions and 4 deletions

View file

@ -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);

View file

@ -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;
}

View file

@ -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