[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/c14 Canonicalizer.java,1.6,1.7

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

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

Modified Files:
	Canonicalizer.java 
Log Message:
Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
Currently there is still a problem with enveloping signatures and it seems enveloped signatures done via signers.

Index: Canonicalizer.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/c14/Canonicalizer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Canonicalizer.java	14 Jan 2004 16:34:27 -0000	1.6
--- Canonicalizer.java	19 Feb 2004 00:27:59 -0000	1.7
***************
*** 8,11 ****
--- 8,15 ----
   * $Id$
   * $Log$
+  * Revision 1.7  2004/02/19 00:27:59  pelle
+  * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
+  * Currently there is still a problem with enveloping signatures and it seems enveloped signatures done via signers.
+  *
   * Revision 1.6  2004/01/14 16:34:27  pelle
   * New model of references and signatures now pretty much works.
***************
*** 119,126 ****
  import org.neuclear.xml.ElementProxy;
  import org.neuclear.xml.XMLTools;
- import org.neuclear.xml.xmlsec.XMLSecurityException;
  import org.neuclear.xml.transforms.TransformerFactory;
  import org.neuclear.xml.transforms.XPathTransform;
! import org.neuclear.commons.LowLevelException;
  
  import java.io.*;
--- 123,129 ----
  import org.neuclear.xml.ElementProxy;
  import org.neuclear.xml.XMLTools;
  import org.neuclear.xml.transforms.TransformerFactory;
  import org.neuclear.xml.transforms.XPathTransform;
! import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  import java.io.*;
***************
*** 326,330 ****
              namespaceStack.push(ns);
              writeNamespace(ns, sorted);
!         } else if (ns.getURI() != null && ns.getURI().equals("") && element.getParent() != null && element.getParent().getNamespaceURI() != null && !element.getParent().getNamespaceURI().equals("")) {
              writeNamespace(ns, sorted);
          }
--- 329,338 ----
              namespaceStack.push(ns);
              writeNamespace(ns, sorted);
!         } else if (ns.getURI() != null &&
!                 ns.getURI().equals("") &&
!                 element.getParent() != null &&
!                 element.getParent().getNamespaceURI() != null
!                 && !element.getParent().getNamespaceURI().equals("")
!         ) {
              writeNamespace(ns, sorted);
          }