[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec Reference.java,1.10,1.11 XMLSignature.java,1.12,1.13

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

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

Modified Files:
	Reference.java XMLSignature.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

Index: Reference.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/Reference.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Reference.java	19 Feb 2004 00:27:59 -0000	1.10
--- Reference.java	2 Mar 2004 18:39:57 -0000	1.11
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.11  2004/03/02 18:39:57  pelle
+  * Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
+  * they really are no longer necessary with the new non naming naming system.
+  *
   * Revision 1.10  2004/02/19 00:27:59  pelle
   * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
***************
*** 165,168 ****
--- 169,173 ----
          super(Reference.TAG_NAME);
          final Canonicalizer canon;
+         Object ref=null;
          Element transformsElement = addElement("Transforms");
  //        final Element object;
***************
*** 171,176 ****
--- 176,183 ----
              canon=new CanonicalizerWithoutSignature();
              transformsElement.addElement(XMLSecTools.createQName("Transform")).addAttribute("Algorithm","http://www.w3.org/2000/09/xmldsig#enveloped-signature");
+             ref=root;
          } else if (sigtype == XMLSIGTYPE_ENVELOPING){
              canon= new Canonicalizer();
+             ref=root;
          } else {
              throw new XMLSecurityException("Unsupported Signature Method");
***************
*** 183,187 ****
              createAttribute("URI","#"+id);
  
!         addDigest(canon,root);
      }
  
--- 190,194 ----
              createAttribute("URI","#"+id);
  
!         addDigest(canon,ref);
      }
  
***************
*** 247,251 ****
              if (id.startsWith("#")){
  //                System.out.println("Ref: "+id.substring(1));
!                 return XMLTools.getByID(elem,id.substring(1));
              }
              // Non Local URI, we need to load it
--- 254,258 ----
              if (id.startsWith("#")){
  //                System.out.println("Ref: "+id.substring(1));
!                 return XMLTools.getByID(elem,id.substring(1));//.createCopy();
              }
              // Non Local URI, we need to load it

Index: XMLSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XMLSignature.java	19 Feb 2004 00:27:59 -0000	1.12
--- XMLSignature.java	2 Mar 2004 18:39:57 -0000	1.13
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.13  2004/03/02 18:39:57  pelle
+  * Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
+  * they really are no longer necessary with the new non naming naming system.
+  *
   * Revision 1.12  2004/02/19 00:27:59  pelle
   * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
***************
*** 311,317 ****
          final byte[] sig = getSignature();
          final byte[] cansi = si.canonicalize();
!         System.out.println("Canonicalized:");
!         System.out.println(new String(cansi));
!         System.out.println("------");
  
          try {
--- 315,321 ----
          final byte[] sig = getSignature();
          final byte[] cansi = si.canonicalize();
! //        System.out.println("Canonicalized:");
! //        System.out.println(new String(cansi));
! //        System.out.println("------");
  
          try {