projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1542 from ninjarobot/UriTemplateMatchException
[mono.git]
/
mcs
/
class
/
corlib
/
System.Security.Cryptography
/
RSAOAEPKeyExchangeFormatter.cs
diff --git
a/mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
b/mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
index 73978afe039abba5265b918da9eebbcb3aaf89da..5aed06336a3e92719061d820ac16c8168b41fe3b 100644
(file)
--- a/
mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
+++ b/
mcs/class/corlib/System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
@@
-33,9
+33,7
@@
using Mono.Security.Cryptography;
namespace System.Security.Cryptography {
namespace System.Security.Cryptography {
-#if NET_2_0
[ComVisible (true)]
[ComVisible (true)]
-#endif
public class RSAOAEPKeyExchangeFormatter : AsymmetricKeyExchangeFormatter {
private RSA rsa;
public class RSAOAEPKeyExchangeFormatter : AsymmetricKeyExchangeFormatter {
private RSA rsa;
@@
-70,12
+68,10
@@
namespace System.Security.Cryptography {
{
if (random == null)
random = RandomNumberGenerator.Create (); // create default
{
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);
}
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);
}
SHA1 sha1 = SHA1.Create ();
return PKCS1.Encrypt_OAEP (rsa, sha1, random, rgbData);
}