X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Security.Cryptography%2FRSAOAEPKeyExchangeFormatter.cs;h=73978afe039abba5265b918da9eebbcb3aaf89da;hb=c694fb8e631e8f79b383b8ff696228abe1689a20;hp=b95d6ad81a4dc2eb6b343e81d969a81d53685a8e;hpb=0abc2e6270020edc4a5b4c66f93b4ae582815f20;p=mono.git

diff --git a/mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs b/mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
index b95d6ad81a4..73978afe039 100644
--- a/mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
@@ -5,11 +5,7 @@
 //	Sebastien Pouliot <sebastien@ximian.com>
 //
 // (C) 2002 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell (http://www.novell.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 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
@@ -31,11 +27,15 @@
 // 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 { 
 
+#if NET_2_0
+	[ComVisible (true)]
+#endif
 	public class RSAOAEPKeyExchangeFormatter : AsymmetricKeyExchangeFormatter {
 	
 		private RSA rsa;
@@ -70,7 +70,12 @@ namespace System.Security.Cryptography {
 		{
 			if (random == null)
 				random = RandomNumberGenerator.Create ();  // create default
-	
+#if NET_2_0
+			if (rsa == null) {
+				string msg = Locale.GetText ("No RSA key specified");
+				throw new CryptographicUnexpectedOperationException (msg);
+			}
+#endif
 			SHA1 sha1 = SHA1.Create ();
 			return PKCS1.Encrypt_OAEP (rsa, sha1, random, rgbData);
 		}