[ros-diffs] [akhaldi] 69917: [RSAENH_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Tue Nov 17 12:19:29 2015
New Revision: 69917

URL: http://svn.reactos.org/svn/reactos?rev=69917&view=rev
Log:
[RSAENH_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/rostests/winetests/rsaenh/rsaenh.c

Modified: trunk/rostests/winetests/rsaenh/rsaenh.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c?...
==============================================================================
--- trunk/rostests/winetests/rsaenh/rsaenh.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/rsaenh/rsaenh.c	[iso-8859-1] Tue Nov 17 12:19:29 2015
@@ -1166,8 +1166,8 @@

/* Does AES provider support salt? */
     result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0);
-    ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */,
-       "expected NTE_BAD_KEY, got %08x\n", GetLastError());
+    todo_wine ok(result || broken(GetLastError() == NTE_BAD_KEY), /* Vista or older */
+       "Expected OK, got last error %d\n", GetLastError());
     if (result)
         ok(!dwLen, "unexpected salt length %d\n", dwLen);

@@ -1971,8 +1971,7 @@
      * actual buffer.  The private exponent can be omitted, its length is
      * inferred from the passed-in length parameter.
      */
-    dwLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) +
-        rsaPubKey->bitlen / 8 + 5 * rsaPubKey->bitlen / 16;
+    dwLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + rsaPubKey->bitlen / 2;
     for (; dwLen < sizeof(abPlainPrivateKey); dwLen++)
     {
         result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey);