You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2006/08/03 18:06:17 UTC
svn commit: r428440 - in /xml/security/trunk/src/org/apache/xml/security:
signature/ transforms/implementations/
Author: raul
Date: Thu Aug 3 09:06:16 2006
New Revision: 428440
URL: http://svn.apache.org/viewvc?rev=428440&view=rev
Log:
Remove circumventBug
Modified:
xml/security/trunk/src/org/apache/xml/security/signature/XMLSignatureInput.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
Modified: xml/security/trunk/src/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/signature/XMLSignatureInput.java?rev=428440&r1=428439&r2=428440&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/signature/XMLSignatureInput.java Thu Aug 3 09:06:16 2006
@@ -590,7 +590,6 @@
Document doc = db.parse(this.getOctetStream());
- XMLUtils.circumventBug2650(doc);
this._subNode=doc.getDocumentElement();
} catch (SAXException ex) {
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java?rev=428440&r1=428439&r2=428440&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java Thu Aug 3 09:06:16 2006
@@ -62,7 +62,6 @@
c14n.setWriter(os);
}
byte[] result = null;
- input.setNeedsToBeExpanded(true);
result=c14n.engineCanonicalize(input);
XMLSignatureInput output=new XMLSignatureInput(result);
if (os!=null) {
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java?rev=428440&r1=428439&r2=428440&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java Thu Aug 3 09:06:16 2006
@@ -90,7 +90,6 @@
c14n.setWriter(os);
}
byte []result;
- input.setNeedsToBeExpanded(true);
result =c14n.engineCanonicalize(input, inclusiveNamespaces);
XMLSignatureInput output=new XMLSignatureInput(result);
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java?rev=428440&r1=428439&r2=428440&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java Thu Aug 3 09:06:16 2006
@@ -85,7 +85,6 @@
if (os!=null) {
c14n.setWriter( os);
}
- input.setNeedsToBeExpanded(true);
byte []result;
result =c14n.engineCanonicalize(input, inclusiveNamespaces);
XMLSignatureInput output=new XMLSignatureInput(result);
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java?rev=428440&r1=428439&r2=428440&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java Thu Aug 3 09:06:16 2006
@@ -60,7 +60,6 @@
}
byte[] result = null;
- input.setNeedsToBeExpanded(true);
result=c14n.engineCanonicalize(input);
XMLSignatureInput output=new XMLSignatureInput(result);
if (os!=null) {
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java?rev=428440&r1=428439&r2=428440&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java Thu Aug 3 09:06:16 2006
@@ -118,8 +118,9 @@
* @return true if needs to be circunvent for bug.
*/
private boolean needsCircunvent(String str) {
- return true;
- //return str.contains("namespace");
+ //return true;
+ //return false;
+ return str.contains("namespace") || str.contains("name()");
}
static class XPathNodeFilter implements NodeFilter {
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java?rev=428440&r1=428439&r2=428440&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java Thu Aug 3 09:06:16 2006
@@ -140,7 +140,6 @@
}
}
- input.setNeedsToBeExpanded(true);
input.addNodeFilter(new XPath2NodeFilter(unionNodes,substractNodes,intersectNodes));
input.setNodeSet(true);