[ros-diffs] [akhaldi] 73319: [RSAENH_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

Author: akhaldi
Date: Thu Nov 17 23:54:08 2016
New Revision: 73319

URL: http://svn.reactos.org/svn/reactos?rev=73319&view=rev
Log:
[RSAENH_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

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] Thu Nov 17 23:54:08 2016
@@ -2801,8 +2801,18 @@
     if (!result) return;

result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash);
-    ok (result, "%08x\n", GetLastError());
-    if (!result) return;
+    ok (result ||
+        broken(!result), /* Windows 8 and greater */
+        "%08x\n", GetLastError());
+    if (!result)
+    {
+        win_skip("Broken TLS1 hash creation\n");
+        CryptDestroyKey(hRSAKey);
+        CryptDestroyKey(hMasterSecret);
+        CryptReleaseContext(hProv, 0);
+        CryptAcquireContextA(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_DELETEKEYSET);
+        return;
+    }

/* Deriving the server write encryption key from the master hash can't
      * succeed before the encryption key algorithm is set.
@@ -3836,7 +3846,7 @@
         if(!BASE_PROV) test_key_derivation(STRONG_PROV ? "STRONG" : "ENH");
         clean_up_base_environment();
     }
-    if (!init_base_environment(MS_ENHANCED_PROV_A, 0))
+
     test_key_permissions();
     test_key_initialization();
     test_schannel_provider();