You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2005/07/22 11:55:31 UTC

cvs commit: xml-security/c/src/tools/c14n c14n.cpp

blautenb    2005/07/22 02:55:31

  Modified:    c/src/tools/c14n c14n.cpp
  Log:
  No longer need to expand namespaces for standard canonicalisation - the namespace stack will do the work instead.
  
  Revision  Changes    Path
  1.9       +2 -5      xml-security/c/src/tools/c14n/c14n.cpp
  
  Index: c14n.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/c14n/c14n.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- c14n.cpp	3 Feb 2005 13:35:56 -0000	1.8
  +++ c14n.cpp	22 Jul 2005 09:55:31 -0000	1.9
  @@ -158,14 +158,11 @@
   	doc = parser->getDocument();
   	DOMDocument *theDOM = parser->getDocument();
   
  -	// Expand name spaces so that c14n will work correctly
  -	XSECNameSpaceExpander nse(theDOM);
  -	nse.expandNameSpaces();
  -
   	// Creat the canonicalizer
   
   	XSECC14n20010315 canon(theDOM);
   	canon.setCommentsProcessing(printComments);
  +	canon.setUseNamespaceStack(true);
   
   	// canon.XPathSelectNodes("(/descendant-or-self::node() | /descendant-or-self::node()/attribute::* | /descendant-or-self::node()/namespace::*)[ self::ietf:e1 or (parent::ietf:e1 and not(self::text() or self::e2)) or count (id(\"E3\") | ancestor-or-self::node()) = count (ancestor-or-self::node())]");