Assign _safeProvHandle when importing public keys.

bartonjs · bartonjs · commit e97d111261f2 · 2015-06-11T16:09:36.000-07:00
diff --git a/src/System.Security.Cryptography.RSA/src/System/Security/Cryptography/RSACryptoServiceProvider.cs b/src/System.Security.Cryptography.RSA/src/System/Security/Cryptography/RSACryptoServiceProvider.cs
@@ -308,6 +308,7 @@ public void ImportCspBlob(byte[] keyBlob)
                 SafeProvHandle safeProvHandleTemp = SafeProvHandle.InvalidHandle;
                 AcquireSafeProviderHandle(ref safeProvHandleTemp);
                 CapiHelper.ImportKeyBlob(safeProvHandleTemp, (CspProviderFlags)0, keyBlob, ref _safeKeyHandle);
+                _safeProvHandle = safeProvHandleTemp;
             }
             else
             {
diff --git a/src/System.Security.Cryptography.RSA/tests/SignVerify.cs b/src/System.Security.Cryptography.RSA/tests/SignVerify.cs
@@ -158,7 +158,6 @@ public static void ExpectSignature_SHA256_1024_Stream()
         }
 
         [Fact]
-        [ActiveIssue(1888, PlatformID.Windows)]
         [ActiveIssue(1964, PlatformID.AnyUnix)]
         public static void VerifySignature_SHA1_2048()
         {
@@ -202,7 +201,6 @@ public static void VerifySignature_SHA1_2048()
         }
 
         [Fact]
-        [ActiveIssue(1888, PlatformID.Windows)]
         [ActiveIssue(1964, PlatformID.AnyUnix)]
         public static void VerifySignature_SHA256_1024()
         {
@@ -230,7 +228,6 @@ public static void VerifySignature_SHA256_1024()
         }
 
         [Fact]
-        [ActiveIssue(1888, PlatformID.Windows)]
         [ActiveIssue(1964, PlatformID.AnyUnix)]
         public static void VerifySignature_SHA256_2048()
         {
@@ -494,7 +491,6 @@ public static void ExpectedHashSignature_SHA256_2048()
         }
 
         [Fact]
-        [ActiveIssue(1888, PlatformID.Windows)]
         [ActiveIssue(1964, PlatformID.AnyUnix)]
         public static void VerifyHashSignature_SHA1_2048()
         {
@@ -545,7 +541,6 @@ public static void VerifyHashSignature_SHA1_2048()
         }
 
         [Fact]
-        [ActiveIssue(1888, PlatformID.Windows)]
         [ActiveIssue(1964, PlatformID.AnyUnix)]
         public static void VerifyHashSignature_SHA256_1024()
         {
@@ -580,7 +575,6 @@ public static void VerifyHashSignature_SHA256_1024()
         }
 
         [Fact]
-        [ActiveIssue(1888, PlatformID.Windows)]
         [ActiveIssue(1964, PlatformID.AnyUnix)]
         public static void VerifyHashSignature_SHA256_2048()
         {

Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,7 @@ public void ImportCspBlob(byte[] keyBlob)`
`308`	`308`	`SafeProvHandle safeProvHandleTemp = SafeProvHandle.InvalidHandle;`
`309`	`309`	`AcquireSafeProviderHandle(ref safeProvHandleTemp);`
`310`	`310`	`CapiHelper.ImportKeyBlob(safeProvHandleTemp, (CspProviderFlags)0, keyBlob, ref _safeKeyHandle);`
	`311`	`+ _safeProvHandle = safeProvHandleTemp;`
`311`	`312`	`}`
`312`	`313`	`else`
`313`	`314`	`{`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,6 @@ public static void ExpectSignature_SHA256_1024_Stream()`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`[Fact]`
`161`		`- [ActiveIssue(1888, PlatformID.Windows)]`
`162`	`161`	`[ActiveIssue(1964, PlatformID.AnyUnix)]`
`163`	`162`	`public static void VerifySignature_SHA1_2048()`
`164`	`163`	`{`
`@@ -202,7 +201,6 @@ public static void VerifySignature_SHA1_2048()`
`202`	`201`	`}`
`203`	`202`
`204`	`203`	`[Fact]`
`205`		`- [ActiveIssue(1888, PlatformID.Windows)]`
`206`	`204`	`[ActiveIssue(1964, PlatformID.AnyUnix)]`
`207`	`205`	`public static void VerifySignature_SHA256_1024()`
`208`	`206`	`{`
`@@ -230,7 +228,6 @@ public static void VerifySignature_SHA256_1024()`
`230`	`228`	`}`
`231`	`229`
`232`	`230`	`[Fact]`
`233`		`- [ActiveIssue(1888, PlatformID.Windows)]`
`234`	`231`	`[ActiveIssue(1964, PlatformID.AnyUnix)]`
`235`	`232`	`public static void VerifySignature_SHA256_2048()`
`236`	`233`	`{`
`@@ -494,7 +491,6 @@ public static void ExpectedHashSignature_SHA256_2048()`
`494`	`491`	`}`
`495`	`492`
`496`	`493`	`[Fact]`
`497`		`- [ActiveIssue(1888, PlatformID.Windows)]`
`498`	`494`	`[ActiveIssue(1964, PlatformID.AnyUnix)]`
`499`	`495`	`public static void VerifyHashSignature_SHA1_2048()`
`500`	`496`	`{`
`@@ -545,7 +541,6 @@ public static void VerifyHashSignature_SHA1_2048()`
`545`	`541`	`}`
`546`	`542`
`547`	`543`	`[Fact]`
`548`		`- [ActiveIssue(1888, PlatformID.Windows)]`
`549`	`544`	`[ActiveIssue(1964, PlatformID.AnyUnix)]`
`550`	`545`	`public static void VerifyHashSignature_SHA256_1024()`
`551`	`546`	`{`
`@@ -580,7 +575,6 @@ public static void VerifyHashSignature_SHA256_1024()`
`580`	`575`	`}`
`581`	`576`
`582`	`577`	`[Fact]`
`583`		`- [ActiveIssue(1888, PlatformID.Windows)]`
`584`	`578`	`[ActiveIssue(1964, PlatformID.AnyUnix)]`
`585`	`579`	`public static void VerifyHashSignature_SHA256_2048()`
`586`	`580`	`{`