Merge pull request dotnet#2015 from bartonjs/rsa-publickey-only

Assign _safeProvHandle when importing public keys.
josteink · Jun 12, 2015 · 9029ffc · 9029ffc
2 parents 9c4637a + e97d111
commit 9029ffc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/...em.Security.Cryptography.RSA/src/System/Security/Cryptography/RSACryptoServiceProvider.cs b/...em.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()
         {