Fix two tests in System.Security.Cryptography.Rsa.Tests.System.Securi…

…ty.Cryptography.Algorithms.Tests on Windows 2012 server (dotnet/corefx#13883) Commit migrated from dotnet/corefx@0b976c5
Nisden · Nov 22, 2016 · 5e41aa9 · 5e41aa9
1 parent e8e3240
commit 5e41aa9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/DefaultRSAProvider.cs b/src/libraries/System.Security.Cryptography.Algorithms/tests/DefaultRSAProvider.cs
@@ -28,15 +28,9 @@ public bool Supports384PrivateKey
             {
                 if (!_supports384PrivateKey.HasValue)
                 {
-                    bool hasSupport = true;
-
-                    // For Windows 7 (Microsoft Windows 6.1) this is false for RSACng.
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    {
-                        hasSupport = !RuntimeInformation.OSDescription.Contains("Windows 6.1");
-                    }
-
-                    _supports384PrivateKey = hasSupport;
+                    // For Windows 7 (Microsoft Windows 6.1) and Windows 8 (Microsoft Windows 6.2) this is false for RSACng.
+                    _supports384PrivateKey = !RuntimeInformation.OSDescription.Contains("Windows 6.1") &&
+                        !RuntimeInformation.OSDescription.Contains("Windows 6.2");
                 }
 
                 return _supports384PrivateKey.Value;

diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/RSACngProvider.cs b/src/libraries/System.Security.Cryptography.Cng/tests/RSACngProvider.cs
@@ -26,8 +26,9 @@ public bool Supports384PrivateKey
             {
                 if (!_supports384PrivateKey.HasValue)
                 {
-                    // For Windows 7 (Microsoft Windows 6.1) this is false for RSACng.
-                    _supports384PrivateKey = !RuntimeInformation.OSDescription.Contains("Windows 6.1");
+                    // For Windows 7 (Microsoft Windows 6.1) and Windows 8 (Microsoft Windows 6.2) this is false for RSACng.
+                    _supports384PrivateKey = !RuntimeInformation.OSDescription.Contains("Windows 6.1") &&
+                        !RuntimeInformation.OSDescription.Contains("Windows 6.2");
                 }
 
                 return _supports384PrivateKey.Value;