Factor out HasConsistentPrivateKey, move check out of interop.

Moving the consistency check from the Interop type to the consumer removes the dependency on an SR value in all callers.

Author: bartonjs

src/Common/src/Interop/Unix/libcrypto/Interop.Rsa.cs

@@ -83,16 +83,6 @@ internal static unsafe RSAParameters ExportRsaParameters(SafeRsaHandle key, bool
                     rsaParameters.Q = ExtractBignum(rsaStructure->q, halfModulus);
                     rsaParameters.DQ = ExtractBignum(rsaStructure->dmq1, halfModulus);
                     rsaParameters.InverseQ = ExtractBignum(rsaStructure->iqmp, halfModulus);
-
-                    if (rsaParameters.D == null ||
-                        rsaParameters.P == null ||
-                        rsaParameters.DP == null ||
-                        rsaParameters.Q == null ||
-                        rsaParameters.DQ == null ||
-                        rsaParameters.InverseQ == null)
-                    {
-                        throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey);
-                    }
                 }
             }
             finally

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)