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 #697 from linquize/atom-bug
[mono.git]
/
mcs
/
class
/
corlib
/
System.Security.Cryptography
/
DSASignatureDeformatter.cs
diff --git
a/mcs/class/corlib/System.Security.Cryptography/DSASignatureDeformatter.cs
b/mcs/class/corlib/System.Security.Cryptography/DSASignatureDeformatter.cs
old mode 100755
(executable)
new mode 100644
(file)
index
a8e41f8
..
6a7284a
--- a/
mcs/class/corlib/System.Security.Cryptography/DSASignatureDeformatter.cs
+++ b/
mcs/class/corlib/System.Security.Cryptography/DSASignatureDeformatter.cs
@@
-3,14
+3,11
@@
//
// Authors:
// Thomas Neidhart (tome@sbox.tugraz.at)
//
// Authors:
// Thomas Neidhart (tome@sbox.tugraz.at)
-// Sebastien Pouliot
(sebastien@ximian.com)
+// Sebastien Pouliot
<sebastien@xamarin.com>
//
// Portions (C) 2002 Motus Technologies Inc. (http://www.motus.com)
//
// Portions (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)
+// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@
-32,11
+29,14
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Globalization;
using System.Globalization;
+using System.Runtime.InteropServices;
+
+using Mono.Security.Cryptography;
namespace System.Security.Cryptography {
namespace System.Security.Cryptography {
+ [ComVisible (true)]
public class DSASignatureDeformatter : AsymmetricSignatureDeformatter {
private DSA dsa;
public class DSASignatureDeformatter : AsymmetricSignatureDeformatter {
private DSA dsa;
@@
-55,14
+55,10
@@
namespace System.Security.Cryptography {
if (strName == null)
throw new ArgumentNullException ("strName");
if (strName == null)
throw new ArgumentNullException ("strName");
- try {
- // just to test, we don't need the object
- SHA1 hash = SHA1.Create (strName);
- }
- catch (InvalidCastException) {
+ var instance = PKCS1.CreateFromName (strName) as SHA1;
+ if (instance == null)
throw new CryptographicUnexpectedOperationException (
Locale.GetText ("DSA requires SHA1"));
throw new CryptographicUnexpectedOperationException (
Locale.GetText ("DSA requires SHA1"));
- }
}
public override void SetKey (AsymmetricAlgorithm key)
}
public override void SetKey (AsymmetricAlgorithm key)
@@
-72,7
+68,8
@@
namespace System.Security.Cryptography {
// a DSA keypair
dsa = (DSA) key;
}
// a DSA keypair
dsa = (DSA) key;
}
- // here null is accepted!
+ else
+ throw new ArgumentNullException ("key");
}
public override bool VerifySignature (byte[] rgbHash, byte[] rgbSignature)
}
public override bool VerifySignature (byte[] rgbHash, byte[] rgbSignature)