Merge pull request #487 from mayerwin/patch-1
[mono.git] / mcs / class / corlib / System.Security.Cryptography / DSA.cs
old mode 100755 (executable)
new mode 100644 (file)
index 1dd9c83..73abc4d
@@ -2,34 +2,60 @@
 // System.Security.Cryptography.DSA.cs class implementation
 //
 // Authors:
-//   Thomas Neidhart (tome@sbox.tugraz.at)
-//   Sebastien Pouliot (spouliot@motus.com)
+//     Thomas Neidhart (tome@sbox.tugraz.at)
+//     Sebastien Pouliot (sebastien@ximian.com)
 //
-// Portions (C) 2002 Motus Technologies Inc. (http://www.motus.com)
+// Portions (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2005, 2008 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 System.Text;
-//using System.Xml;
+
+using Mono.Xml;
+using Mono.Security;
 
 // References:
 // a.  FIPS PUB 186-2: Digital Signature Standard (DSS) 
 //     http://csrc.nist.gov/publications/fips/fips186-2/fips186-2-change1.pdf
 
-namespace System.Security.Cryptography
-{
-       /// <summary>
-       /// Abstract base class for all implementations of the DSA algorithm
-       /// </summary>
-       public abstract class DSA : AsymmetricAlgorithm
-       {
-               // now public like RSA (but unlike MS which is internal)
-               // this caused problems to compile the test suite
-               public DSA () {}
-       
+namespace System.Security.Cryptography {
+
+       [ComVisible (true)]
+       public abstract class DSA : AsymmetricAlgorithm {
+
+               // Constructor visibility fixed in Fx 2.0
+               protected DSA ()
+               {
+               }
+
                public static new DSA Create ()
                {
+#if FULL_AOT_RUNTIME
+                       return new System.Security.Cryptography.DSACryptoServiceProvider ();
+#else
                        return Create ("System.Security.Cryptography.DSA");
+#endif
                }
 
                public static new DSA Create (string algName) 
@@ -41,7 +67,7 @@ namespace System.Security.Cryptography
                
                public abstract DSAParameters ExportParameters (bool includePrivateParameters);
 
-               protected void ZeroizePrivateKey (DSAParameters parameters)
+               internal void ZeroizePrivateKey (DSAParameters parameters)
                {
                        if (parameters.X != null)
                                Array.Clear (parameters.X, 0, parameters.X.Length);
@@ -50,24 +76,23 @@ namespace System.Security.Cryptography
                public override void FromXmlString (string xmlString) 
                {
                        if (xmlString == null)
-                               throw new ArgumentNullException ();
+                               throw new ArgumentNullException ("xmlString");
                        
                        DSAParameters dsaParams = new DSAParameters ();
                        try {
-/*                             XmlDocument xml = new XmlDocument ();
-                               xml.LoadXml (xmlString);
-                               dsaParams.P = GetElement (xml, "P");
-                               dsaParams.Q = GetElement (xml, "Q");
-                               dsaParams.G = GetElement (xml, "G");
-                               dsaParams.Y = GetElement (xml, "Y");
-                               dsaParams.J = GetElement (xml, "J");
-                               dsaParams.Seed = GetElement (xml, "Seed");
-                               byte[] counter = GetElement (xml, "PgenCounter");
-                               // else we may have an exception
-                               byte[] counter4b = new byte[4];
-                               Array.Copy (counter, 0, counter4b, 0, counter.Length);
-                               dsaParams.Counter = BitConverter.ToInt32 (counter4b, 0);
-                               dsaParams.X = GetElement (xml, "X");*/
+                               dsaParams.P = GetNamedParam (xmlString, "P");
+                               dsaParams.Q = GetNamedParam (xmlString, "Q");
+                               dsaParams.G = GetNamedParam (xmlString, "G");
+                               dsaParams.J = GetNamedParam (xmlString, "J");
+                               dsaParams.Y = GetNamedParam (xmlString, "Y");
+                               dsaParams.X = GetNamedParam (xmlString, "X");
+                               dsaParams.Seed = GetNamedParam (xmlString, "Seed");
+                               byte[] counter = GetNamedParam (xmlString, "PgenCounter");
+                               if (counter != null) {
+                                       byte[] counter4b = new byte [4]; // always 4 bytes
+                                       Buffer.BlockCopy (counter, 0, counter4b, 0, counter.Length);
+                                       dsaParams.Counter = BitConverterLE.ToInt32 (counter4b, 0);
+                               }
                                ImportParameters (dsaParams);
                        }
                        catch {
@@ -81,6 +106,7 @@ namespace System.Security.Cryptography
                
                public abstract void ImportParameters (DSAParameters parameters);
 
+               // note: using SecurityElement.ToXml wouldn't generate the same string as the MS implementation
                public override string ToXmlString (bool includePrivateParameters)
                {
                        StringBuilder sb = new StringBuilder ();
@@ -101,35 +127,45 @@ namespace System.Security.Cryptography
                                sb.Append ("</G>");
 
                                sb.Append ("<Y>");
-                               sb.Append (Convert.ToBase64StringdsaParams.Y));
+                               sb.Append (Convert.ToBase64String (dsaParams.Y));
                                sb.Append( "</Y>");
 
-                               sb.Append ("<J>");
-                               sb.Append (Convert.ToBase64String (dsaParams.J));
-                               sb.Append ("</J>");
-                               
-                               sb.Append ("<Seed>");
-                               sb.Append (Convert.ToBase64String (dsaParams.Seed));
-                               sb.Append ("</Seed>");
-                               
-                               sb.Append ("<PgenCounter>");
-                               // the number of bytes is important (no matter == 0x00)
-                               byte[] inArr = BitConverter.GetBytes (dsaParams.Counter);
-                               int l = inArr.Length;
-                               while (inArr[l-1] == 0x00)
-                                       l--;
-                               byte[] c = new byte[l];
-                               Array.Copy (inArr, 0, c, 0, l);
-                               sb.Append (Convert.ToBase64String (c));
-                               sb.Append ("</PgenCounter>");
+                               if (dsaParams.J != null) {
+                                       // if J wasn't imported then it's not exported and neither 
+                                       // is part of the XML output
+                                       sb.Append ("<J>");
+                                       sb.Append (Convert.ToBase64String (dsaParams.J));
+                                       sb.Append ("</J>");
+                               }
+
+                               if (dsaParams.Seed != null) {
+                                       sb.Append ("<Seed>");
+                                       sb.Append (Convert.ToBase64String (dsaParams.Seed));
+                                       sb.Append ("</Seed>");
+
+                                       sb.Append ("<PgenCounter>");
+                                       // the number of bytes is important (no matter == 0x00)
+                                       if (dsaParams.Counter != 0) {
+                                               byte[] inArr = BitConverterLE.GetBytes (dsaParams.Counter);
+                                               int l = inArr.Length;
+                                               while (inArr[l-1] == 0x00)
+                                                       l--;
+
+                                               sb.Append (Convert.ToBase64String (inArr, 0, l));
+                                       } else {
+                                               sb.Append ("AA==");     // base64 encoded 0
+                                       }
+                                       sb.Append ("</PgenCounter>");
+                               }
 
                                if (dsaParams.X != null) {
                                        sb.Append ("<X>");
                                        sb.Append (Convert.ToBase64String (dsaParams.X));
                                        sb.Append ("</X>");
                                }
-                               else if (includePrivateParameters)
-                                       throw new CryptographicException();
+                               else if (includePrivateParameters) {
+                                       throw new ArgumentNullException ("X");
+                               }
 
                                sb.Append ("</DSAKeyValue>");
                        }
@@ -137,15 +173,10 @@ namespace System.Security.Cryptography
                                ZeroizePrivateKey (dsaParams);
                                throw;
                        }
-                       finally {
-                               ZeroizePrivateKey (dsaParams);
-                       }
                                                
                        return sb.ToString ();
                }
                
                public abstract bool VerifySignature (byte[] rgbHash, byte[] rgbSignature);
-               
-       } // DSA
-       
-} // System.Security.Cryptography
+       }
+}