fix for DSA

diff --git a/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
index ceef9625fe5ae26c34889a8bdeffc8f5ee47d38b..07200f28b4e90e0b126da82922e3c8aa6cbf1619 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
@@ -114,6 +114,7 @@ namespace System.Security.Cryptography {
                                persisted = true;
                                this.FromXmlString (store.KeyValue);
                        }
+                       privateKeyExportable = (parameters.Flags & CspProviderFlags.UseNonExportableKey) == 0;
                }
 
                ~DSACryptoServiceProvider ()

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
index e56a20c75cd3ce2c0797c843aad267d91a7354f0..ac005e2711ad4262a087e309e7924682803f47bc 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
@@ -1046,6 +1046,16 @@ public class DSACryptoServiceProviderTest {
                dsa = new DSACryptoServiceProvider (minKeySize);
                dsa.ImportCspBlob (blob);
        }
+
+       [Test] //bug 38054
+       public void NonExportableKeysAreNonExportable ()
+       {
+               var cspParams = new CspParameters (13, null, "Mono1024");
+               cspParams.KeyContainerName = "TestDSAKey";
+               cspParams.Flags = CspProviderFlags.UseNonExportableKey;
+               var rsa = new DSACryptoServiceProvider(cspParams);
+               Assert.Throws<CryptographicException>(() => rsa.ExportParameters(true));
+       }
 }
 
 }