Phew - I started to sweat ...
I was confused by the comment on top of the method:
/**
* Encode a byte array and fold lines at the standard 76th character.
*
* @param binaryData <code>byte[]<code> to be base64 encoded
* @return the <code>String<code> with encoded data
*/
public static String encode(byte[] binaryData) {
return encode(binaryData, BASE64DEFAULTLENGTH, false);
}
Also, looking at the "encode(binaryData, BASE64DEFAULTLENGTH, false) it
seems to me that the length parameter does not have any effect because
there is a fixed "19" in the second for loop (19*4=76). The length and
the computed "quartesPerLine" value don't seem to have an effect to
line length. I would assume that "quartesPerLine" would be used instead
of the fixed value "19" :-) ?
Regards,
Werner
Davanum Srinivas wrote:
> Please see the following...am switching OFF linewrapping by default :)
>
>
>>+ public static String encode(byte[] binaryData) {
>>+ return encode(binaryData, BASE64DEFAULTLENGTH, false);
>>+ }
>
>
> On 9/8/05, Werner Dittmann <[EMAIL PROTECTED]> wrote:
>
>>Dims,
>>
>>according to Base64: the xml-security stuff has parameters to enforce
>>linewrapping.
>>
>>After very careful test I found that line wrapping is problematic -
>>I use the very specifically the parameter that disables line wrapping.
>>The last case was the SignatureConfirmation. I had to explicitly disable
>>line wrapping of Base64.encode. In SignatureConfirmation the "Value"
>>attribute holds the signature value, BAse64 encoded. If you use line
>>wrapping in this case, that is inside the value string then that does
>>not work. At least with Xerces togehter with Axis I got modifications
>>because the linefeed(s) were either not parsed correctly. IMO either
>>linefeeds are not allowed in attribute strings or the xerces parser or
>>the Axis serialization/deserialization has a serious problem with this.
>>
>>I saw a similar problem when we tested STR Transform. This worked only
>>without linewrapping.
>>
>>BTW, why do you need linewrapping for Base64 encoded strings?
>>
>>Regards,
>>Werner
>>
>>
>>[EMAIL PROTECTED] wrote:
>>
>>>Author: dims
>>>Date: Thu Sep 8 10:03:16 2005
>>>New Revision: 279584
>>>
>>>URL: http://svn.apache.org/viewcvs?rev=279584&view=rev
>>>Log:
>>>can't depend on xml-security Base64 stuff...making a copy (added a param for
>>>wrapping line during encoding)
>>>
>>>Added:
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/Base64.java
>>>Modified:
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/WSSecurityEngine.java
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/errors.properties
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/SecurityTokenReference.java
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/UsernameToken.java
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/transform/STRTransform.java
>>>
>>> webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/WSSecurityUtil.java
>>>
>>>Modified:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/WSSecurityEngine.java
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/WSSecurityEngine.java?rev=279584&r1=279583&r2=279584&view=diff
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/WSSecurityEngine.java
>>> (original)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/WSSecurityEngine.java
>>> Thu Sep 8 10:03:16 2005
>>>@@ -30,9 +30,9 @@
>>> import org.apache.ws.security.transform.STRTransform;
>>> import org.apache.ws.security.util.WSSecurityUtil;
>>> import org.apache.ws.security.util.XmlSchemaDateFormat;
>>>+import org.apache.ws.security.util.Base64;
>>> import org.apache.xml.security.encryption.XMLCipher;
>>> import org.apache.xml.security.encryption.XMLEncryptionException;
>>>-import org.apache.xml.security.exceptions.Base64DecodingException;
>>> import org.apache.xml.security.exceptions.XMLSecurityException;
>>> import org.apache.xml.security.keys.KeyInfo;
>>> import org.apache.xml.security.keys.content.X509Data;
>>>@@ -42,7 +42,6 @@
>>> import org.apache.xml.security.signature.XMLSignature;
>>> import org.apache.xml.security.signature.XMLSignatureException;
>>> import org.apache.xml.security.transforms.Transform;
>>>-import org.apache.xml.security.utils.Base64;
>>> import org.opensaml.SAMLAssertion;
>>> import org.opensaml.SAMLException;
>>> import org.opensaml.SAMLObject;
>>>@@ -1414,14 +1413,7 @@
>>> sb.append(((Text) curr).getData());
>>> }
>>> String encodedData = sb.toString();
>>>- try {
>>>- return Base64.decode(encodedData);
>>>- } catch (Base64DecodingException e) {
>>>- throw new WSSecurityException(WSSecurityException.FAILURE,
>>>- null,
>>>- null,
>>>- e);
>>>- }
>>>+ return Base64.decode(encodedData);
>>> }
>>>
>>> /**
>>>
>>>Modified:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/errors.properties
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/errors.properties?rev=279584&r1=279583&r2=279584&view=diff
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/errors.properties
>>> (original)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/errors.properties
>>> Thu Sep 8 10:03:16 2005
>>>@@ -64,4 +64,7 @@
>>> #
>>> noSAMLdoc=Cannot convert SAML to DOM document
>>> invalidSAMLsecurity=SAML token security failure
>>>-invalidData=Invalid data: {0}
>>>\ No newline at end of file
>>>+invalidData=Invalid data: {0}
>>>+#
>>>+decoding.divisible.four = It should be divisible by four
>>>+decoding.general = Error while decoding
>>>
>>>Modified:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java?rev=279584&r1=279583&r2=279584&view=diff
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java
>>> (original)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java
>>> Thu Sep 8 10:03:16 2005
>>>@@ -22,7 +22,7 @@
>>> import org.apache.ws.security.WSSecurityException;
>>> import org.apache.ws.security.util.DOM2Writer;
>>> import org.apache.ws.security.util.WSSecurityUtil;
>>>-import org.apache.xml.security.utils.Base64;
>>>+import org.apache.ws.security.util.Base64;
>>> import org.w3c.dom.Document;
>>> import org.w3c.dom.Element;
>>> import org.w3c.dom.Node;
>>>
>>>Modified:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/SecurityTokenReference.java
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/SecurityTokenReference.java?rev=279584&r1=279583&r2=279584&view=diff
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/SecurityTokenReference.java
>>> (original)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/SecurityTokenReference.java
>>> Thu Sep 8 10:03:16 2005
>>>@@ -26,9 +26,9 @@
>>> import org.apache.ws.security.components.crypto.Crypto;
>>> import org.apache.ws.security.util.DOM2Writer;
>>> import org.apache.ws.security.util.WSSecurityUtil;
>>>+import org.apache.ws.security.util.Base64;
>>> import org.apache.xml.security.exceptions.XMLSecurityException;
>>> import org.apache.xml.security.keys.content.x509.XMLX509IssuerSerial;
>>>-import org.apache.xml.security.utils.Base64;
>>> import org.w3c.dom.*;
>>>
>>> import java.security.cert.CertificateEncodingException;
>>>
>>>Modified:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/UsernameToken.java
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/UsernameToken.java?rev=279584&r1=279583&r2=279584&view=diff
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/UsernameToken.java
>>> (original)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/UsernameToken.java
>>> Thu Sep 8 10:03:16 2005
>>>@@ -25,7 +25,7 @@
>>> import org.apache.ws.security.util.DOM2Writer;
>>> import org.apache.ws.security.util.WSSecurityUtil;
>>> import org.apache.ws.security.util.XmlSchemaDateFormat;
>>>-import org.apache.xml.security.utils.Base64;
>>>+import org.apache.ws.security.util.Base64;
>>> import org.w3c.dom.Document;
>>> import org.w3c.dom.Element;
>>> import org.w3c.dom.Node;
>>>
>>>Modified:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/transform/STRTransform.java
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/transform/STRTransform.java?rev=279584&r1=279583&r2=279584&view=diff
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/transform/STRTransform.java
>>> (original)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/transform/STRTransform.java
>>> Thu Sep 8 10:03:16 2005
>>>@@ -26,13 +26,13 @@
>>> import org.apache.ws.security.message.token.SecurityTokenReference;
>>> import org.apache.ws.security.message.token.X509Security;
>>> import org.apache.ws.security.util.WSSecurityUtil;
>>>+import org.apache.ws.security.util.Base64;
>>> import org.apache.xml.security.c14n.CanonicalizationException;
>>> import org.apache.xml.security.c14n.Canonicalizer;
>>> import org.apache.xml.security.c14n.InvalidCanonicalizerException;
>>> import org.apache.xml.security.exceptions.XMLSecurityException;
>>> import org.apache.xml.security.signature.XMLSignatureInput;
>>> import org.apache.xml.security.transforms.TransformSpi;
>>>-import org.apache.xml.security.utils.Base64;
>>> import org.apache.xml.security.utils.XMLUtils;
>>> import org.w3c.dom.Document;
>>> import org.w3c.dom.Element;
>>>@@ -391,7 +391,7 @@
>>> WSSecurityUtil.setNamespace(elem, WSConstants.WSSE_NS, prefix);
>>> elem.setAttributeNS(WSConstants.XMLNS_NS, "xmlns", "");
>>> elem.setAttributeNS(null, "ValueType",
>>> X509Security.getType(WSSConfig.getDefaultWSConfig()));
>>>- Text certText = doc.createTextNode(Base64.encode(data, 0)); // no
>>>line wrap
>>>+ Text certText = doc.createTextNode(Base64.encode(data));
>>> elem.appendChild(certText);
>>> return elem;
>>> }
>>>
>>>Added:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/Base64.java
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/Base64.java?rev=279584&view=auto
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/Base64.java
>>> (added)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/Base64.java
>>> Thu Sep 8 10:03:16 2005
>>>@@ -0,0 +1,367 @@
>>>+/*
>>>+ * Copyright 1999-2004 The Apache Software Foundation.
>>>+ *
>>>+ * Licensed under the Apache License, Version 2.0 (the "License");
>>>+ * you may not use this file except in compliance with the License.
>>>+ * You may obtain a copy of the License at
>>>+ *
>>>+ * http://www.apache.org/licenses/LICENSE-2.0
>>>+ *
>>>+ * Unless required by applicable law or agreed to in writing, software
>>>+ * distributed under the License is distributed on an "AS IS" BASIS,
>>>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>>>+ * See the License for the specific language governing permissions and
>>>+ * limitations under the License.
>>>+ *
>>>+ */
>>>+package org.apache.ws.security.util;
>>>+
>>>+import org.apache.ws.security.WSSecurityException;
>>>+
>>>+/**
>>>+ * Implementation of MIME's Base64 encoding and decoding conversions.
>>>+ * Optimized code. (raw version taken from oreilly.jonathan.util,
>>>+ * and currently org.apache.xerces.ds.util.Base64)
>>>+ *
>>>+ * @author Raul Benito(Of the xerces copy, and little adaptations).
>>>+ * @author Anli Shundi
>>>+ * @author Christian Geuer-Pollmann
>>>+ * @see <A HREF="ftp://ftp.isi.edu/in-notes/rfc2045.txt">RFC 2045</A>
>>>+ * @see
>>>org.apache.xml.security.transforms.implementations.TransformBase64Decode
>>>+ */
>>>+public class Base64 {
>>>+
>>>+ /**
>>>+ * [EMAIL PROTECTED] org.apache.commons.logging} logging facility
>>>+ */
>>>+ static org.apache.commons.logging.Log log =
>>>+
>>>org.apache.commons.logging.LogFactory.getLog(Base64.class.getName());
>>>+
>>>+
>>>+ /**
>>>+ * Field BASE64DEFAULTLENGTH
>>>+ */
>>>+ public static final int BASE64DEFAULTLENGTH = 76;
>>>+
>>>+ /**
>>>+ * Field _base64length
>>>+ */
>>>+ static int _base64length = Base64.BASE64DEFAULTLENGTH;
>>>+
>>>+ static private final int BASELENGTH = 255;
>>>+ static private final int LOOKUPLENGTH = 64;
>>>+ static private final int TWENTYFOURBITGROUP = 24;
>>>+ static private final int EIGHTBIT = 8;
>>>+ static private final int SIXTEENBIT = 16;
>>>+ static private final int FOURBYTE = 4;
>>>+ static private final int SIGN = -128;
>>>+ static private final char PAD = '=';
>>>+ static private final boolean fDebug = false;
>>>+ static final private byte [] base64Alphabet = new byte[BASELENGTH];
>>>+ static final private char [] lookUpBase64Alphabet = new
>>>char[LOOKUPLENGTH];
>>>+
>>>+ static {
>>>+
>>>+ for (int i = 0; i < BASELENGTH; i++) {
>>>+ base64Alphabet[i] = -1;
>>>+ }
>>>+ for (int i = 'Z'; i >= 'A'; i--) {
>>>+ base64Alphabet[i] = (byte) (i - 'A');
>>>+ }
>>>+ for (int i = 'z'; i >= 'a'; i--) {
>>>+ base64Alphabet[i] = (byte) (i - 'a' + 26);
>>>+ }
>>>+
>>>+ for (int i = '9'; i >= '0'; i--) {
>>>+ base64Alphabet[i] = (byte) (i - '0' + 52);
>>>+ }
>>>+
>>>+ base64Alphabet['+'] = 62;
>>>+ base64Alphabet['/'] = 63;
>>>+
>>>+ for (int i = 0; i <= 25; i++)
>>>+ lookUpBase64Alphabet[i] = (char) ('A' + i);
>>>+
>>>+ for (int i = 26, j = 0; i <= 51; i++, j++)
>>>+ lookUpBase64Alphabet[i] = (char) ('a' + j);
>>>+
>>>+ for (int i = 52, j = 0; i <= 61; i++, j++)
>>>+ lookUpBase64Alphabet[i] = (char) ('0' + j);
>>>+ lookUpBase64Alphabet[62] = '+';
>>>+ lookUpBase64Alphabet[63] = '/';
>>>+
>>>+ }
>>>+
>>>+ private Base64() {
>>>+ // we don't allow instantiation
>>>+ }
>>>+
>>>+ /**
>>>+ * Encode a byte array and fold lines at the standard 76th character.
>>>+ *
>>>+ * @param binaryData <code>byte[]<code> to be base64 encoded
>>>+ * @return the <code>String<code> with encoded data
>>>+ */
>>>+ public static String encode(byte[] binaryData) {
>>>+ return encode(binaryData, BASE64DEFAULTLENGTH, false);
>>>+ }
>>>+
>>>+ protected static boolean isWhiteSpace(byte octect) {
>>>+ return (octect == 0x20 || octect == 0xd || octect == 0xa || octect
>>>== 0x9);
>>>+ }
>>>+
>>>+ protected static boolean isPad(byte octect) {
>>>+ return (octect == PAD);
>>>+ }
>>>+
>>>+ /**
>>>+ * Encodes hex octects into Base64
>>>+ *
>>>+ * @param binaryData Array containing binaryData
>>>+ * @return Encoded Base64 array
>>>+ */
>>>+ /**
>>>+ * Encode a byte array in Base64 format and return an optionally
>>>+ * wrapped line.
>>>+ *
>>>+ * @param binaryData <code>byte[]</code> data to be encoded
>>>+ * @param length <code>int<code> length of wrapped lines; No
>>>wrapping if less than 4.
>>>+ * @return a <code>String</code> with encoded data
>>>+ */
>>>+ public static String encode(byte[] binaryData, int length, boolean
>>>wrap) {
>>>+
>>>+ if (length < 4) {
>>>+ length = Integer.MAX_VALUE;
>>>+ }
>>>+
>>>+ if (binaryData == null)
>>>+ return null;
>>>+
>>>+ int lengthDataBits = binaryData.length * EIGHTBIT;
>>>+ if (lengthDataBits == 0) {
>>>+ return "";
>>>+ }
>>>+
>>>+ int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
>>>+ int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
>>>+ int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 :
>>>numberTriplets;
>>>+ int quartesPerLine = length / 4;
>>>+ int numberLines = (numberQuartet - 1) / quartesPerLine;
>>>+ char encodedData[];
>>>+
>>>+ encodedData = new char[(numberQuartet * 4) + (wrap ? numberLines :
>>>0)];
>>>+
>>>+ byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
>>>+
>>>+ int encodedIndex = 0;
>>>+ int dataIndex = 0;
>>>+ int i = 0;
>>>+ if (fDebug) {
>>>+ System.out.println("number of triplets = " + numberTriplets);
>>>+ }
>>>+
>>>+ for (int line = 0; line < numberLines; line++) {
>>>+ for (int quartet = 0; quartet < 19; quartet++) {
>>>+ b1 = binaryData[dataIndex++];
>>>+ b2 = binaryData[dataIndex++];
>>>+ b3 = binaryData[dataIndex++];
>>>+
>>>+ if (fDebug) {
>>>+ System.out.println("b1= " + b1 + ", b2= " + b2 + ", b3=
>>>" + b3);
>>>+ }
>>>+
>>>+ l = (byte) (b2 & 0x0f);
>>>+ k = (byte) (b1 & 0x03);
>>>+
>>>+ byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte)
>>>((b1) >> 2 ^ 0xc0);
>>>+
>>>+ byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte)
>>>((b2) >> 4 ^ 0xf0);
>>>+ byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte)
>>>((b3) >> 6 ^ 0xfc);
>>>+
>>>+ if (fDebug) {
>>>+ System.out.println("val2 = " + val2);
>>>+ System.out.println("k4 = " + (k << 4));
>>>+ System.out.println("vak = " + (val2 | (k << 4)));
>>>+ }
>>>+
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 |
>>>(k << 4)];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2)
>>>| val3];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 &
>>>0x3f];
>>>+
>>>+ i++;
>>>+ }
>>>+ if(wrap) {
>>>+ encodedData[encodedIndex++] = 0xa;
>>>+ }
>>>+ }
>>>+
>>>+ for (; i < numberTriplets; i++) {
>>>+ b1 = binaryData[dataIndex++];
>>>+ b2 = binaryData[dataIndex++];
>>>+ b3 = binaryData[dataIndex++];
>>>+
>>>+ if (fDebug) {
>>>+ System.out.println("b1= " + b1 + ", b2= " + b2 + ", b3= " +
>>>b3);
>>>+ }
>>>+
>>>+ l = (byte) (b2 & 0x0f);
>>>+ k = (byte) (b1 & 0x03);
>>>+
>>>+ byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte)
>>>((b1) >> 2 ^ 0xc0);
>>>+
>>>+ byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte)
>>>((b2) >> 4 ^ 0xf0);
>>>+ byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte)
>>>((b3) >> 6 ^ 0xfc);
>>>+
>>>+ if (fDebug) {
>>>+ System.out.println("val2 = " + val2);
>>>+ System.out.println("k4 = " + (k << 4));
>>>+ System.out.println("vak = " + (val2 | (k << 4)));
>>>+ }
>>>+
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k <<
>>>4)];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) |
>>>val3];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
>>>+ }
>>>+
>>>+ // form integral number of 6-bit groups
>>>+ if (fewerThan24bits == EIGHTBIT) {
>>>+ b1 = binaryData[dataIndex];
>>>+ k = (byte) (b1 & 0x03);
>>>+ if (fDebug) {
>>>+ System.out.println("b1=" + b1);
>>>+ System.out.println("b1<<2 = " + (b1 >> 2));
>>>+ }
>>>+ byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte)
>>>((b1) >> 2 ^ 0xc0);
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
>>>+ encodedData[encodedIndex++] = PAD;
>>>+ encodedData[encodedIndex++] = PAD;
>>>+ } else if (fewerThan24bits == SIXTEENBIT) {
>>>+ b1 = binaryData[dataIndex];
>>>+ b2 = binaryData[dataIndex + 1];
>>>+ l = (byte) (b2 & 0x0f);
>>>+ k = (byte) (b1 & 0x03);
>>>+
>>>+ byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte)
>>>((b1) >> 2 ^ 0xc0);
>>>+ byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte)
>>>((b2) >> 4 ^ 0xf0);
>>>+
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k <<
>>>4)];
>>>+ encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
>>>+ encodedData[encodedIndex++] = PAD;
>>>+ }
>>>+ return new String(encodedData);
>>>+ }
>>>+
>>>+ /**
>>>+ * Decodes Base64 data into octects
>>>+ *
>>>+ * @param encoded String containing Base64 data
>>>+ * @return Array containing decoded data.
>>>+ */
>>>+ public static byte[] decode(String encoded) throws WSSecurityException {
>>>+ byte[] base64Data = encoded.getBytes();
>>>+ // remove white spaces
>>>+ int len = removeWhiteSpace(base64Data);
>>>+
>>>+ if (len % FOURBYTE != 0) {
>>>+ throw new WSSecurityException("decoding.divisible.four");
>>>+ //should be divisible by four
>>>+ }
>>>+
>>>+ int numberQuadruple = (len / FOURBYTE);
>>>+
>>>+ if (numberQuadruple == 0)
>>>+ return new byte[0];
>>>+
>>>+ byte decodedData[] = null;
>>>+ byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
>>>+
>>>+
>>>+ int i = 0;
>>>+ int encodedIndex = 0;
>>>+ int dataIndex = 0;
>>>+
>>>+ //decodedData = new byte[ (numberQuadruple)*3];
>>>+ dataIndex = (numberQuadruple - 1) * 4;
>>>+ encodedIndex = (numberQuadruple - 1) * 3;
>>>+ //first last bits.
>>>+ b1 = base64Alphabet[base64Data[dataIndex++]];
>>>+ b2 = base64Alphabet[base64Data[dataIndex++]];
>>>+ if ((b1 == -1) || (b2 == -1)) {
>>>+ throw new WSSecurityException("decoding.general");//if found
>>>"no data" just return null
>>>+ }
>>>+
>>>+
>>>+ byte d3, d4;
>>>+ b3 = base64Alphabet[d3 = base64Data[dataIndex++]];
>>>+ b4 = base64Alphabet[d4 = base64Data[dataIndex++]];
>>>+ if ((b3 == -1) || (b4 == -1)) {
>>>+ //Check if they are PAD characters
>>>+ if (isPad(d3) && isPad(d4)) { //Two PAD e.g.
>>>3c[Pad][Pad]
>>>+ if ((b2 & 0xf) != 0)//last 4 bits should be zero
>>>+ throw new WSSecurityException("decoding.general");
>>>+ decodedData = new byte[ encodedIndex + 1 ];
>>>+ decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
>>>+ } else if (!isPad(d3) && isPad(d4)) { //One PAD
>>>e.g. 3cQ[Pad]
>>>+ if ((b3 & 0x3) != 0)//last 2 bits should be zero
>>>+ throw new WSSecurityException("decoding.general");
>>>+ decodedData = new byte[ encodedIndex + 2 ];
>>>+ decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
>>>+ decodedData[encodedIndex] = (byte) (((b2 & 0xf) << 4) |
>>>((b3 >> 2) & 0xf));
>>>+ } else {
>>>+ throw new WSSecurityException("decoding.general");//an
>>>error like "3c[Pad]r", "3cdX", "3cXd", "3cXX" where X is non data
>>>+ }
>>>+ } else {
>>>+ //No PAD e.g 3cQl
>>>+ decodedData = new byte[encodedIndex + 3];
>>>+ decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
>>>+ decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3
>>>>> 2) & 0xf));
>>>+ decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
>>>+ }
>>>+ encodedIndex = 0;
>>>+ dataIndex = 0;
>>>+ //the begin
>>>+ for (i = numberQuadruple - 1; i > 0; i--) {
>>>+ b1 = base64Alphabet[base64Data[dataIndex++]];
>>>+ b2 = base64Alphabet[base64Data[dataIndex++]];
>>>+ b3 = base64Alphabet[base64Data[dataIndex++]];
>>>+ b4 = base64Alphabet[base64Data[dataIndex++]];
>>>+
>>>+ if ((b1 == -1) ||
>>>+ (b2 == -1) ||
>>>+ (b3 == -1) ||
>>>+ (b4 == -1)) {
>>>+ throw new WSSecurityException("decoding.general");//if
>>>found "no data" just return null
>>>+ }
>>>+
>>>+ decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
>>>+ decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3
>>>>> 2) & 0xf));
>>>+ decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
>>>+ }
>>>+ return decodedData;
>>>+ }
>>>+
>>>+ /**
>>>+ * remove WhiteSpace from MIME containing encoded Base64 data.
>>>+ *
>>>+ * @param data the byte array of base64 data (with WS)
>>>+ * @return the new length
>>>+ */
>>>+ protected static int removeWhiteSpace(byte[] data) {
>>>+ if (data == null)
>>>+ return 0;
>>>+
>>>+ // count characters that's not whitespace
>>>+ int newSize = 0;
>>>+ int len = data.length;
>>>+ for (int i = 0; i < len; i++) {
>>>+ byte dataS = data[i];
>>>+ if (!isWhiteSpace(dataS))
>>>+ data[newSize++] = dataS;
>>>+ }
>>>+ return newSize;
>>>+ }
>>>+}
>>>
>>>Modified:
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/WSSecurityUtil.java
>>>URL:
>>>http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/WSSecurityUtil.java?rev=279584&r1=279583&r2=279584&view=diff
>>>==============================================================================
>>>---
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/WSSecurityUtil.java
>>> (original)
>>>+++
>>>webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/util/WSSecurityUtil.java
>>> Thu Sep 8 10:03:16 2005
>>>@@ -31,7 +31,6 @@
>>> import org.apache.ws.security.message.token.BinarySecurity;
>>> import org.apache.ws.security.message.token.X509Security;
>>> import org.apache.xml.security.algorithms.JCEMapper;
>>>-import org.apache.xml.security.utils.Base64;
>>> import org.apache.xpath.XPathAPI;
>>> import org.w3c.dom.Attr;
>>> import org.w3c.dom.Document;
>>>
>>>
>>>
>>>---------------------------------------------------------------------
>>>To unsubscribe, e-mail: [EMAIL PROTECTED]
>>>For additional commands, e-mail: [EMAIL PROTECTED]
>>>
>>>
>>
>>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]