Fix S.Security.Cryptography desktop tests (#19505)

safern · stephentoub · commit 021867054976 · 2017-05-08T22:23:11.000-04:00
* Fix 19283

* Fix 19238

* Fix 19080

* Fix 19079
diff --git a/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs b/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs
@@ -42,8 +42,7 @@ public static void ExportAutoKey()
             Assert.Equal(privateParams.Exponent, publicParams.Exponent);
         }
 
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")]
-        [Fact]
+        [ConditionalFact(nameof(EphemeralKeysAreExportable))]
         public static void PaddedExport()
         {
             // OpenSSL's numeric type for the storage of RSA key parts disregards zero-valued
@@ -70,8 +69,7 @@ public static void PaddedExport()
             AssertKeyEquals(ref diminishedDPParameters, ref exported);
         }
 
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")] 
-        [Fact]
+        [ConditionalFact(nameof(EphemeralKeysAreExportable))]
         public static void LargeKeyImportExport()
         {
             RSAParameters imported = TestData.RSA16384Params;
@@ -100,8 +98,7 @@ public static void LargeKeyImportExport()
             }
         }
 
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")] 
-        [Fact]
+        [ConditionalFact(nameof(EphemeralKeysAreExportable))]
         public static void UnusualExponentImportExport()
         {
             // Most choices for the Exponent value in an RSA key use a Fermat prime.
@@ -146,8 +143,7 @@ public static void ImportExport1032()
             Assert.Null(exportedPublic.D);
         }
 
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")] 
-        [Fact]
+        [ConditionalFact(nameof(EphemeralKeysAreExportable))]
         public static void ImportReset()
         {
             using (RSA rsa = RSAFactory.Create())
@@ -195,8 +191,7 @@ public static void ImportPrivateExportPublic()
             }
         }
 
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")] 
-        [Fact]
+        [ConditionalFact(nameof(EphemeralKeysAreExportable))]
         public static void MultiExport()
         {
             RSAParameters imported = TestData.RSA1024Params;
diff --git a/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/SignVerify.cs b/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/SignVerify.cs
@@ -10,6 +10,9 @@ namespace System.Security.Cryptography.Rsa.Tests
 {
     public class SignVerify
     {
+        public static bool BadKeyFormatDoesntThrow => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer();
+        public static bool InvalidKeySizeDoesntThrow => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer();
+
         [Fact]
         public static void InvalidKeySize_DoesNotInvalidateKey()
         {
@@ -57,7 +60,7 @@ public static void SignNullHash()
             }
         }
 
-        [Fact]
+        [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]
         public static void ExpectedSignature_SHA1_384()
         {
             byte[] expectedSignature =
@@ -88,7 +91,7 @@ public static void ExpectedSignature_SHA1_384()
             }
         }
 
-        [Fact]
+        [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]
         public static void ExpectedSignature_SHA1_1032()
         {
             byte[] expectedSignature =
@@ -260,7 +263,7 @@ public static void ExpectSignature_SHA256_1024_Stream()
             Assert.Equal(expectedSignature, signature);
         }
 
-        [Fact]
+        [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]
         public static void VerifySignature_SHA1_384()
         {
             byte[] signature =
@@ -276,7 +279,7 @@ public static void VerifySignature_SHA1_384()
             VerifySignature(signature, TestData.HelloBytes, "SHA1", TestData.RSA384Parameters);
         }
 
-        [Fact]
+        [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]
         public static void VerifySignature_SHA1_1032()
         {
             byte[] signature =
@@ -472,7 +475,7 @@ public static void NegativeVerify_TamperedData()
             }
         }
 
-        [Fact]
+        [ConditionalFact(nameof(BadKeyFormatDoesntThrow))]
         public static void NegativeVerify_BadKeysize()
         {
             byte[] signature;
diff --git a/src/System.Security.Cryptography.Cng/tests/RsaCngTests.cs b/src/System.Security.Cryptography.Cng/tests/RsaCngTests.cs
@@ -16,6 +16,8 @@ namespace System.Security.Cryptography.Cng.Tests
 {
     public static class RsaCngTests
     {
+        public static bool KeySizeTrustsOSValue => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer();
+
         [Fact]
         public static void SignVerifyHashRoundTrip()
         {
@@ -77,7 +79,7 @@ public static void VerifyHashPss()
             }
         }
 
-        [Fact]
+        [ConditionalFact(nameof(KeySizeTrustsOSValue))]
         public static void RSACng_Ctor_UnusualKeysize_384()
         {
             const int ExpectedKeySize = 384;
@@ -108,7 +110,7 @@ public static void RSACng_Ctor_UnusualKeysize_384()
             }
         }
 
-        [Fact]
+        [ConditionalFact(nameof(KeySizeTrustsOSValue))]
         public static void RSACng_Ctor_UnusualKeysize_1032()
         {
             const int ExpectedKeySize = 1032;

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ public static void ExportAutoKey()`
`42`	`42`	`Assert.Equal(privateParams.Exponent, publicParams.Exponent);`
`43`	`43`	`}`
`44`	`44`
`45`		`- [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")]`
`46`		`- [Fact]`
	`45`	`+ [ConditionalFact(nameof(EphemeralKeysAreExportable))]`
`47`	`46`	`public static void PaddedExport()`
`48`	`47`	`{`
`49`	`48`	`// OpenSSL's numeric type for the storage of RSA key parts disregards zero-valued`
`@@ -70,8 +69,7 @@ public static void PaddedExport()`
`70`	`69`	`AssertKeyEquals(ref diminishedDPParameters, ref exported);`
`71`	`70`	`}`
`72`	`71`
`73`		`- [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")]`
`74`		`- [Fact]`
	`72`	`+ [ConditionalFact(nameof(EphemeralKeysAreExportable))]`
`75`	`73`	`public static void LargeKeyImportExport()`
`76`	`74`	`{`
`77`	`75`	`RSAParameters imported = TestData.RSA16384Params;`
`@@ -100,8 +98,7 @@ public static void LargeKeyImportExport()`
`100`	`98`	`}`
`101`	`99`	`}`
`102`	`100`
`103`		`- [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")]`
`104`		`- [Fact]`
	`101`	`+ [ConditionalFact(nameof(EphemeralKeysAreExportable))]`
`105`	`102`	`public static void UnusualExponentImportExport()`
`106`	`103`	`{`
`107`	`104`	`// Most choices for the Exponent value in an RSA key use a Fermat prime.`
`@@ -146,8 +143,7 @@ public static void ImportExport1032()`
`146`	`143`	`Assert.Null(exportedPublic.D);`
`147`	`144`	`}`
`148`	`145`
`149`		`- [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")]`
`150`		`- [Fact]`
	`146`	`+ [ConditionalFact(nameof(EphemeralKeysAreExportable))]`
`151`	`147`	`public static void ImportReset()`
`152`	`148`	`{`
`153`	`149`	`using (RSA rsa = RSAFactory.Create())`
`@@ -195,8 +191,7 @@ public static void ImportPrivateExportPublic()`
`195`	`191`	`}`
`196`	`192`	`}`
`197`	`193`
`198`		`- [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19238")]`
`199`		`- [Fact]`
	`194`	`+ [ConditionalFact(nameof(EphemeralKeysAreExportable))]`
`200`	`195`	`public static void MultiExport()`
`201`	`196`	`{`
`202`	`197`	`RSAParameters imported = TestData.RSA1024Params;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@ namespace System.Security.Cryptography.Rsa.Tests`
`10`	`10`	`{`
`11`	`11`	`public class SignVerify`
`12`	`12`	`{`
	`13`	`+ public static bool BadKeyFormatDoesntThrow => !PlatformDetection.IsFullFramework \|\| PlatformDetection.IsNetfx462OrNewer();`
	`14`	`+ public static bool InvalidKeySizeDoesntThrow => !PlatformDetection.IsFullFramework \|\| PlatformDetection.IsNetfx462OrNewer();`
	`15`	`+`
`13`	`16`	`[Fact]`
`14`	`17`	`public static void InvalidKeySize_DoesNotInvalidateKey()`
`15`	`18`	`{`
`@@ -57,7 +60,7 @@ public static void SignNullHash()`
`57`	`60`	`}`
`58`	`61`	`}`
`59`	`62`
`60`		`- [Fact]`
	`63`	`+ [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]`
`61`	`64`	`public static void ExpectedSignature_SHA1_384()`
`62`	`65`	`{`
`63`	`66`	`byte[] expectedSignature =`
`@@ -88,7 +91,7 @@ public static void ExpectedSignature_SHA1_384()`
`88`	`91`	`}`
`89`	`92`	`}`
`90`	`93`
`91`		`- [Fact]`
	`94`	`+ [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]`
`92`	`95`	`public static void ExpectedSignature_SHA1_1032()`
`93`	`96`	`{`
`94`	`97`	`byte[] expectedSignature =`
`@@ -260,7 +263,7 @@ public static void ExpectSignature_SHA256_1024_Stream()`
`260`	`263`	`Assert.Equal(expectedSignature, signature);`
`261`	`264`	`}`
`262`	`265`
`263`		`- [Fact]`
	`266`	`+ [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]`
`264`	`267`	`public static void VerifySignature_SHA1_384()`
`265`	`268`	`{`
`266`	`269`	`byte[] signature =`
`@@ -276,7 +279,7 @@ public static void VerifySignature_SHA1_384()`
`276`	`279`	`VerifySignature(signature, TestData.HelloBytes, "SHA1", TestData.RSA384Parameters);`
`277`	`280`	`}`
`278`	`281`
`279`		`- [Fact]`
	`282`	`+ [ConditionalFact(nameof(InvalidKeySizeDoesntThrow))]`
`280`	`283`	`public static void VerifySignature_SHA1_1032()`
`281`	`284`	`{`
`282`	`285`	`byte[] signature =`
`@@ -472,7 +475,7 @@ public static void NegativeVerify_TamperedData()`
`472`	`475`	`}`
`473`	`476`	`}`
`474`	`477`
`475`		`- [Fact]`
	`478`	`+ [ConditionalFact(nameof(BadKeyFormatDoesntThrow))]`
`476`	`479`	`public static void NegativeVerify_BadKeysize()`
`477`	`480`	`{`
`478`	`481`	`byte[] signature;`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ namespace System.Security.Cryptography.Cng.Tests`
`16`	`16`	`{`
`17`	`17`	`public static class RsaCngTests`
`18`	`18`	`{`
	`19`	`+ public static bool KeySizeTrustsOSValue => !PlatformDetection.IsFullFramework \|\| PlatformDetection.IsNetfx462OrNewer();`
	`20`	`+`
`19`	`21`	`[Fact]`
`20`	`22`	`public static void SignVerifyHashRoundTrip()`
`21`	`23`	`{`
`@@ -77,7 +79,7 @@ public static void VerifyHashPss()`
`77`	`79`	`}`
`78`	`80`	`}`
`79`	`81`
`80`		`- [Fact]`
	`82`	`+ [ConditionalFact(nameof(KeySizeTrustsOSValue))]`
`81`	`83`	`public static void RSACng_Ctor_UnusualKeysize_384()`
`82`	`84`	`{`
`83`	`85`	`const int ExpectedKeySize = 384;`
`@@ -108,7 +110,7 @@ public static void RSACng_Ctor_UnusualKeysize_384()`
`108`	`110`	`}`
`109`	`111`	`}`
`110`	`112`
`111`		`- [Fact]`
	`113`	`+ [ConditionalFact(nameof(KeySizeTrustsOSValue))]`
`112`	`114`	`public static void RSACng_Ctor_UnusualKeysize_1032()`
`113`	`115`	`{`
`114`	`116`	`const int ExpectedKeySize = 1032;`