[akhaldi] 75949: [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.

Author: akhaldi
Date: Sun Sep 24 11:18:27 2017
New Revision: 75949

URL: http://svn.reactos.org/svn/reactos?rev=75949&view=rev
Log:
[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.

Modified:
    trunk/reactos/dll/win32/wintrust/asn.c
    trunk/reactos/dll/win32/wintrust/softpub.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wintrust/asn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wintrust/asn.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/asn.c	[iso-8859-1] Sun Sep 24 11:18:27 2017
@@ -1830,10 +1830,10 @@
             /* 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);

Modified: trunk/reactos/dll/win32/wintrust/softpub.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub…
==============================================================================
--- trunk/reactos/dll/win32/wintrust/softpub.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/softpub.c	[iso-8859-1] Sun Sep 24 11:18:27 2017
@@ -339,7 +339,7 @@
 
     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;
     }

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Sep 24 11:18:27 2017
@@ -206,7 +206,7 @@
 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