[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 840895ce08efa4a4c6fe13ee2d5a87b57203fcf8..163fd303d4bfefb8e8bce17706e3913380e120ce 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RSAPKCS1KeyExchangeDeformatter.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RSAPKCS1KeyExchangeDeformatter.cs
@@ -5,24 +5,43 @@
 //     Sebastien Pouliot <sebastien@ximian.com>
 //
 // (C) 2002 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell (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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Globalization;
+using System.Runtime.InteropServices;
 using Mono.Security.Cryptography;
 
 namespace System.Security.Cryptography { 
 
+       [ComVisible (true)]
        public class RSAPKCS1KeyExchangeDeformatter : AsymmetricKeyExchangeDeformatter {
        
                private RSA rsa;
-               private string param;
+//             private string param;
                private RandomNumberGenerator random;
        
                public RSAPKCS1KeyExchangeDeformatter () 
                {
-                       rsa = null;
                }
        
                public RSAPKCS1KeyExchangeDeformatter (AsymmetricAlgorithm key) 
@@ -40,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)