// Sebastien Pouliot (sebastien@ximian.com)
//
// Portions (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.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
// 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 Mono.Xml;
namespace System.Security.Cryptography {
- public abstract class DSA : AsymmetricAlgorithm {
+ [ComVisible (true)]
+ public abstract class DSA : AsymmetricAlgorithm {
-#if NET_2_0
// Constructor visibility fixed in Fx 2.0
protected DSA ()
-#else
- // LAMESPEC: It says to derive new DSA implemenation from DSA class.
- // Well it's aint gonna be easy this way.
- // RSA constructor is public
- internal DSA ()
-#endif
{
}
Array.Clear (parameters.X, 0, parameters.X.Length);
}
- private byte[] GetNamedParam (SecurityElement se, string param)
- {
- SecurityElement sep = se.SearchForChildByTag (param);
- if (sep == null)
- return null;
- return Convert.FromBase64String (sep.Text);
- }
-
public override void FromXmlString (string xmlString)
{
if (xmlString == null)
DSAParameters dsaParams = new DSAParameters ();
try {
- SecurityParser sp = new SecurityParser ();
- sp.LoadXml (xmlString);
- SecurityElement se = sp.ToXml ();
- if (se.Tag != "DSAKeyValue")
- throw new Exception ();
- dsaParams.P = GetNamedParam (se, "P");
- dsaParams.Q = GetNamedParam (se, "Q");
- dsaParams.G = GetNamedParam (se, "G");
- dsaParams.J = GetNamedParam (se, "J");
- dsaParams.Y = GetNamedParam (se, "Y");
- dsaParams.X = GetNamedParam (se, "X");
- dsaParams.Seed = GetNamedParam (se, "Seed");
- byte[] counter = GetNamedParam (se, "PgenCounter");
+ 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);
sb.Append (Convert.ToBase64String (dsaParams.Y));
sb.Append( "</Y>");
- sb.Append ("<J>");
- sb.Append (Convert.ToBase64String (dsaParams.J));
- sb.Append ("</J>");
+ 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 ("</X>");
}
else if (includePrivateParameters) {
-#if NET_2_0
throw new ArgumentNullException ("X");
-#else
- throw new CryptographicException (
- Locale.GetText ("Missing private key informations"));
-#endif
}
sb.Append ("</DSAKeyValue>");