[corlib] Parse datetime string using culture calendar. Fixes #18052

[mono.git] / mcs / class / corlib / System.Security.Cryptography / RSAPKCS1KeyExchangeDeformatter.cs

diff --git a/mcs/class/corlib/System.Security.Cryptography/RSAPKCS1KeyExchangeDeformatter.cs b/mcs/class/corlib/System.Security.Cryptography/RSAPKCS1KeyExchangeDeformatter.cs
index 7035ad2fa0ec528452fa07ecc3d2bdd7f755daf1..163fd303d4bfefb8e8bce17706e3913380e120ce 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RSAPKCS1KeyExchangeDeformatter.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RSAPKCS1KeyExchangeDeformatter.cs
@@ -5,7 +5,7 @@
 //     Sebastien Pouliot <sebastien@ximian.com>
 //
 // (C) 2002 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -33,18 +33,15 @@ using Mono.Security.Cryptography;
 
 namespace System.Security.Cryptography { 
 
-#if NET_2_0
        [ComVisible (true)]
-#endif
        public class RSAPKCS1KeyExchangeDeformatter : AsymmetricKeyExchangeDeformatter {
        
                private RSA rsa;
-               private string param;
+//             private string param;
                private RandomNumberGenerator random;
        
                public RSAPKCS1KeyExchangeDeformatter () 
                {
-                       rsa = null;
                }
        
                public RSAPKCS1KeyExchangeDeformatter (AsymmetricAlgorithm key) 
@@ -62,13 +59,18 @@ namespace System.Security.Cryptography {
                        set { random = value; }
                }
        
-               public override byte[] DecryptKeyExchange (byte[] rgbData) 
+               public override byte[] DecryptKeyExchange (byte[] rgbIn) 
                {
                        if (rsa == null) {
                                throw new CryptographicUnexpectedOperationException (
                                        Locale.GetText ("No key pair available."));
                        }
-                       return PKCS1.Decrypt_v15 (rsa, rgbData);
+
+                       byte[] result = PKCS1.Decrypt_v15 (rsa, rgbIn);
+                       if (result != null)
+                               return result;
+
+                       throw new CryptographicException (Locale.GetText ("PKCS1 decoding error."));
                }
        
                public override void SetKey (AsymmetricAlgorithm key)