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 2005/02/11 19:13:01 UTC
cvs commit: xml-security/src/org/apache/xml/security/signature XMLSignatureInput.java
raul 2005/02/11 10:13:01
Modified: src/org/apache/xml/security/transforms/implementations
TransformBase64Decode.java
src/org/apache/xml/security/signature XMLSignatureInput.java
Log:
Fix bug 33393
PR: 33393
Revision Changes Path
1.19 +4 -0 xml-security/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
Index: TransformBase64Decode.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TransformBase64Decode.java 2 Oct 2004 07:42:57 -0000 1.18
+++ TransformBase64Decode.java 11 Feb 2005 18:13:01 -0000 1.19
@@ -137,8 +137,12 @@
byte[] decodedBytes = Base64.decode(base64Bytes);
return new XMLSignatureInput(decodedBytes);
}
+ if (input.isByteArray()) {
+ Base64.decode(input.getBytes(),os);
+ } else {
Base64.decode(new BufferedInputStream(input.getOctetStreamReal())
,os);
+ }
XMLSignatureInput output=new XMLSignatureInput((byte[])null);
output.setOutputStream(os);
return output;
1.34 +11 -1 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XMLSignatureInput.java 24 Dec 2004 12:26:17 -0000 1.33
+++ XMLSignatureInput.java 11 Feb 2005 18:13:01 -0000 1.34
@@ -434,6 +434,16 @@
return ( ((this._inputOctetStreamProxy != null) || bytes!=null)
&& ((this._inputNodeSet == null) && _subNode ==null));
}
+
+ /**
+ * Determines if the object has been set up with a ByteArray
+ *
+ * @return true is the object has been set up with an octet stream
+ */
+ public boolean isByteArray() {
+ return ( (bytes!=null)
+ && ((this._inputNodeSet == null) && _subNode ==null));
+ }
/**
* Is the object correctly set up?