Merge pull request #2233 from bartonjs/UnixRsa-1984

Fix outstanding issues in Unix RSA tests

Author: stephentoub

src/System.Security.Cryptography.RSA/src/Internal/Cryptography/RsaOpenSsl.cs

@@ -142,7 +142,15 @@ public override RSAParameters ExportParameters(bool includePrivateParameters)
 
             CheckInvalidKey(key);
 
-            return Interop.libcrypto.ExportRsaParameters(key, includePrivateParameters);
+            RSAParameters rsaParameters = Interop.libcrypto.ExportRsaParameters(key, includePrivateParameters);
+            bool hasPrivateKey = rsaParameters.D != null;
+
+            if (hasPrivateKey != includePrivateParameters || !HasConsistentPrivateKey(ref rsaParameters))
+            {
+                throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey);
+            }
+
+            return rsaParameters;
         }
 
         public override unsafe void ImportParameters(RSAParameters parameters)
@@ -218,6 +226,12 @@ private static void ValidateParameters(ref RSAParameters parameters)
             if (parameters.Modulus == null || parameters.Exponent == null)
                 throw new CryptographicException(SR.Argument_InvalidValue);
 
+            if (!HasConsistentPrivateKey(ref parameters))
+                throw new CryptographicException(SR.Argument_InvalidValue);
+        }
+
+        private static bool HasConsistentPrivateKey(ref RSAParameters parameters)
+        {
             if (parameters.D == null)
             {
                 if (parameters.P != null ||
@@ -226,7 +240,7 @@ private static void ValidateParameters(ref RSAParameters parameters)
                     parameters.DQ != null ||
                     parameters.InverseQ != null)
                 {
-                    throw new CryptographicException(SR.Argument_InvalidValue);
+                    return false;
                 }
             }
             else
@@ -237,9 +251,11 @@ private static void ValidateParameters(ref RSAParameters parameters)
                     parameters.DQ == null ||
                     parameters.InverseQ == null)
                 {
-                    throw new CryptographicException(SR.Argument_InvalidValue);
+                    return false;
                 }
             }
+
+            return true;
         }
 
         private static void CheckInvalidKey(SafeRsaHandle key)

src/System.Security.Cryptography.RSA/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs

@@ -17,11 +17,13 @@ public sealed partial class RSACryptoServiceProvider : RSA, ICspAsymmetricAlgori
         public RSACryptoServiceProvider()
         {
             _defer = new RSAOpenSsl();
+            _legalKeySizesValue = _defer.LegalKeySizes;
         }
 
         public RSACryptoServiceProvider(int dwKeySize)
         {
             _defer = new RSAOpenSsl(dwKeySize);
+            _legalKeySizesValue = _defer.LegalKeySizes;
         }
 
         public RSACryptoServiceProvider(int dwKeySize, CspParameters parameters)

src/System.Security.Cryptography.RSA/tests/ImportExport.cs

@@ -155,7 +155,6 @@ public static void MultiExport()
         }
 
         [Fact]
-        [ActiveIssue(1984, PlatformID.AnyUnix)]
         public static void PublicOnlyPrivateExport()
         {
             RSAParameters imported = new RSAParameters

src/System.Security.Cryptography.RSA/tests/KeyGeneration.cs

@@ -8,14 +8,12 @@ namespace System.Security.Cryptography.Rsa.Tests
     public class KeyGeneration
     {
         [Fact]
-        [ActiveIssue(1984, PlatformID.AnyUnix)]
         public static void GenerateMinKey()
         {
             GenerateKey(rsa => GetMin(rsa.LegalKeySizes));
         }
 
         [Fact]
-        [ActiveIssue(1984, PlatformID.AnyUnix)]
         public static void GenerateSecondMinKey()
         {
             GenerateKey(rsa => GetSecondMin(rsa.LegalKeySizes));