[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec KeyInfo.java,1.2,1.3

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1:/tmp/cvs-serv1004/src/java/org/neuclear/xml/xmlsec

Modified Files:
	KeyInfo.java 
Log Message:
Some changes to make the xml a bit more readable.
Also added some helper methods in AbstractElementProxy to make it easier to build objects.

Index: KeyInfo.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/KeyInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeyInfo.java	21 Nov 2003 04:44:31 -0000	1.2
--- KeyInfo.java	11 Dec 2003 16:16:05 -0000	1.3
***************
*** 26,51 ****
          this.pub = pub;
          final Element kv = XMLSecTools.createElementInSignatureSpace("KeyValue");
!         getElement().add(kv);
          if (pub instanceof RSAPublicKey) {
              final RSAPublicKey rsakey = (RSAPublicKey) pub;
              final Element rsav = XMLSecTools.createElementInSignatureSpace("RSAKeyValue");
              kv.add(rsav);
              final Element mod = XMLSecTools.bigIntToElement("Modulus", rsakey.getModulus());
              rsav.add(mod);
              final Element exp = XMLSecTools.bigIntToElement("Exponent", rsakey.getPublicExponent());
              rsav.add(exp);
          } else if ( pub instanceof DSAPublicKey ) {
          	final DSAPublicKey dsaKey = (DSAPublicKey) pub;
          	final Element dsav = XMLSecTools.createElementInSignatureSpace("DSAKeyValue");
          	kv.add(dsav);
        		final DSAParams dsaParams = dsaKey.getParams();
          	final Element p = XMLSecTools.bigIntToElement("P", dsaParams.getP());
          	dsav.add(p); //optional and tied to Q
          	final Element q = XMLSecTools.bigIntToElement("Q", dsaParams.getQ());
          	dsav.add(q); //optional and tied to P
          	final Element g = XMLSecTools.bigIntToElement("G", dsaParams.getG());
          	dsav.add(g); //optional
          	final Element y = XMLSecTools.bigIntToElement("Y", dsaKey.getY());
          	dsav.add(y);
          	//J = (P-1) / Q
          	//seed and pgenCounter
--- 26,59 ----
          this.pub = pub;
          final Element kv = XMLSecTools.createElementInSignatureSpace("KeyValue");
!         addElement(kv);
          if (pub instanceof RSAPublicKey) {
              final RSAPublicKey rsakey = (RSAPublicKey) pub;
              final Element rsav = XMLSecTools.createElementInSignatureSpace("RSAKeyValue");
              kv.add(rsav);
+             kv.addText("\n");
              final Element mod = XMLSecTools.bigIntToElement("Modulus", rsakey.getModulus());
              rsav.add(mod);
+             rsav.addText("\n");
              final Element exp = XMLSecTools.bigIntToElement("Exponent", rsakey.getPublicExponent());
              rsav.add(exp);
+             rsav.addText("\n");
          } else if ( pub instanceof DSAPublicKey ) {
          	final DSAPublicKey dsaKey = (DSAPublicKey) pub;
          	final Element dsav = XMLSecTools.createElementInSignatureSpace("DSAKeyValue");
          	kv.add(dsav);
+             kv.addText("\n");
        		final DSAParams dsaParams = dsaKey.getParams();
          	final Element p = XMLSecTools.bigIntToElement("P", dsaParams.getP());
          	dsav.add(p); //optional and tied to Q
+             dsav.addText("\n");
          	final Element q = XMLSecTools.bigIntToElement("Q", dsaParams.getQ());
          	dsav.add(q); //optional and tied to P
+             dsav.addText("\n");
          	final Element g = XMLSecTools.bigIntToElement("G", dsaParams.getG());
          	dsav.add(g); //optional
+             dsav.addText("\n");
          	final Element y = XMLSecTools.bigIntToElement("Y", dsaKey.getY());
          	dsav.add(y);
+             dsav.addText("\n");
          	//J = (P-1) / Q
          	//seed and pgenCounter