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 2004/09/18 18:45:53 UTC
cvs commit: xml-security/src/org/apache/xml/security/signature XMLSignatureInput.java
raul 2004/09/18 09:45:53
Modified: src/org/apache/xml/security/transforms/implementations
TransformC14NWithComments.java TransformC14N.java
src/org/apache/xml/security/signature XMLSignatureInput.java
Log:
Simplify the call to engineCanocalizeSubtree sending null in the excludeNode instead of doing
if and call diferent signature methods.
Revision Changes Path
1.8 +2 -6 xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
Index: TransformC14NWithComments.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TransformC14NWithComments.java 12 May 2004 12:00:45 -0000 1.7
+++ TransformC14NWithComments.java 18 Sep 2004 16:45:53 -0000 1.8
@@ -84,12 +84,8 @@
result = c14n.engineCanonicalize(input.getBytes());
} else {
if (input.isElement()) {
- Node excl=input.getExcludeNode();
- if (excl==null) {
- result=c14n.engineCanonicalizeSubTree(input.getSubNode());
- } else {
- result=c14n.engineCanonicalizeSubTree(input.getSubNode(),excl);
- }
+ Node excl=input.getExcludeNode();
+ result=c14n.engineCanonicalizeSubTree(input.getSubNode(),excl);
} else {
result = c14n.engineCanonicalizeXPathNodeSet(input.getNodeSet());
}
1.9 +4 -7 xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14N.java
Index: TransformC14N.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14N.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TransformC14N.java 12 May 2004 12:00:45 -0000 1.8
+++ TransformC14N.java 18 Sep 2004 16:45:53 -0000 1.9
@@ -84,13 +84,10 @@
} else {
if (input.isElement()) {
Node excl=input.getExcludeNode();
- if (excl==null) {
- result=c14n.engineCanonicalizeSubTree(input.getSubNode());
- } else {
- result=c14n.engineCanonicalizeSubTree(input.getSubNode(),excl);
- }
- }
- result = c14n.engineCanonicalizeXPathNodeSet(input.getNodeSet());
+ result=c14n.engineCanonicalizeSubTree(input.getSubNode(),excl);
+ } else {
+ result = c14n.engineCanonicalizeXPathNodeSet(input.getNodeSet());
+ }
}
return new XMLSignatureInput(result);
} catch (ParserConfigurationException ex) {
1.29 +8 -12 xml-security/src/org/apache/xml/security/signature/XMLSignatureInput.java
Index: XMLSignatureInput.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/signature/XMLSignatureInput.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XMLSignatureInput.java 18 Aug 2004 04:21:08 -0000 1.28
+++ XMLSignatureInput.java 18 Sep 2004 16:45:53 -0000 1.29
@@ -323,13 +323,9 @@
return this._inputOctetStreamProxy;
} else if (this.isElement()) {
if (bytes==null) {
- Canonicalizer20010315OmitComments c14nizer =
- new Canonicalizer20010315OmitComments();
- if (this.excludeNode!=null ) {
+ Canonicalizer20010315OmitComments c14nizer =
+ new Canonicalizer20010315OmitComments();
bytes=c14nizer.engineCanonicalizeSubTree(this._subNode,this.excludeNode);
- } else {
- bytes=c14nizer.engineCanonicalizeSubTree(this._subNode);
- }
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
baos.write(bytes);
@@ -395,15 +391,15 @@
}
InputStream is = this.getOctetStream();
int available = is.available();
- byte[] data = new byte[available];
+ bytes = new byte[available];
- is.read(data);
+ is.read(bytes);
- if (available != data.length) {
+ if (available != bytes.length) {
throw new IOException("Not enough bytes read");
}
- return data;
+ return bytes;
}
/**