commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/httpclient/src/java/org/apache/commons/httpclient Base64.java
Date Mon, 05 Aug 2002 14:22:45 GMT
dion        2002/08/05 07:22:44

  Modified:    httpclient/src/java/org/apache/commons/httpclient
                        Base64.java
  Log:
  This commit brought to you by Jesus Jones and the number zeroes and ones
  
  Revision  Changes    Path
  1.11      +125 -105  jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Base64.java
  
  Index: Base64.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Base64.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Base64.java	28 Jul 2002 18:08:57 -0000	1.10
  +++ Base64.java	5 Aug 2002 14:22:44 -0000	1.11
  @@ -76,69 +76,73 @@
    * @version $Revision$ $Date$
    */
   public final class Base64 {
  -    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  SIXBIT             = 6;
  -    static private final int  FOURBYTE           = 4;
  -    static private final int  SIGN               = -128;
  -    static private final byte PAD                = ( byte ) '=';
  -    static private byte [] base64Alphabet       = new byte[BASELENGTH];
  -    static private byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
  +    private static final int  BASELENGTH         = 255;
  +    private static final int  LOOKUPLENGTH       = 64;
  +    private static final int  TWENTYFOURBITGROUP = 24;
  +    private static final int  EIGHTBIT           = 8;
  +    private static final int  SIXTEENBIT         = 16;
  +    private static final int  SIXBIT             = 6;
  +    private static final int  FOURBYTE           = 4;
  +    private static final int  SIGN               = -128;
  +    private static final byte PAD                = (byte) '=';
  +    private static byte [] base64Alphabet       = new byte[BASELENGTH];
  +    private static byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
   
       static {
   
  -        for (int i = 0; i<BASELENGTH; i++ ) {
  +        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');
           }
  -        for ( int i = 'z'; i>= 'a'; i--) {
  -            base64Alphabet[i] = (byte) ( i-'a' + 26);
  +        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);
  +        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] = (byte) ('A'+i );
  +        for (int i = 0; i <= 25; i++) {
  +            lookUpBase64Alphabet[i] = (byte) ('A' + i);
  +        }
   
  -        for (int i = 26,  j = 0; i<=51; i++, j++ )
  -            lookUpBase64Alphabet[i] = (byte) ('a'+ j );
  +        for (int i = 26, j = 0; i <= 51; i++, j++) {
  +            lookUpBase64Alphabet[i] = (byte) ('a' + j);
  +        }
   
  -        for (int i = 52,  j = 0; i<=61; i++, j++ )
  -            lookUpBase64Alphabet[i] = (byte) ('0' + j );
  +        for (int i = 52,  j = 0; i <= 61; i++, j++) {
  +            lookUpBase64Alphabet[i] = (byte) ('0' + j);
  +        }
           lookUpBase64Alphabet[62] = (byte) '+';
           lookUpBase64Alphabet[63] = (byte) '/';
   
       }
   
  -    public static boolean isBase64( String isValidString ){
  -        return( isArrayByteBase64( isValidString.getBytes()));
  +    public static boolean isBase64(String isValidString) {
  +        return isArrayByteBase64(isValidString.getBytes());
       }
   
   
  -    static boolean isBase64( byte octect ) {
  +    static boolean isBase64(byte octect) {
           // Should we ignore white space?
  -        return(octect == PAD || base64Alphabet[octect] != -1 );
  +        return (octect == PAD || base64Alphabet[octect] != -1);
       }
   
   
  -    public static boolean isArrayByteBase64( byte[] arrayOctect ) {
  +    public static boolean isArrayByteBase64(byte[] arrayOctect) {
           int length = arrayOctect.length;
  -        if ( length == 0 ) {
  +        if (length == 0) {
               return true;
           }
  -        for ( int i=0; i < length; i++ ) {
  -            if ( !Base64.isBase64( arrayOctect[i] ))
  +        for (int i = 0; i < length; i++) {
  +            if (!Base64.isBase64(arrayOctect[i])) {
                   return false;
  +            }
           }
           return true;
       }
  @@ -149,69 +153,82 @@
        * @param binaryData Array containing binaryData
        * @return Base64-encoded array
        */
  -    public static byte[] encode( byte[] binaryData ) {
  +    public static byte[] encode(byte[] binaryData) {
   
  -        int      lengthDataBits    = binaryData.length*EIGHTBIT;
  -        int      fewerThan24bits   = lengthDataBits%TWENTYFOURBITGROUP;
  -        int      numberTriplets    = lengthDataBits/TWENTYFOURBITGROUP;
  +        int      lengthDataBits    = binaryData.length * EIGHTBIT;
  +        int      fewerThan24bits   = lengthDataBits % TWENTYFOURBITGROUP;
  +        int      numberTriplets    = lengthDataBits / TWENTYFOURBITGROUP;
           byte     encodedData[]     = null;
   
   
  -        if ( fewerThan24bits != 0 ) //data not divisible by 24 bit
  -            encodedData = new byte[ (numberTriplets + 1 )*4  ];
  -        else // 16 or 8 bit
  -            encodedData = new byte[ numberTriplets*4 ];
  -
  -        byte k=0, l=0, b1=0,b2=0,b3=0;
  +        if (fewerThan24bits != 0) { //data not divisible by 24 bit
  +            encodedData = new byte[(numberTriplets + 1) * 4];
  +        } else { // 16 or 8 bit
  +            encodedData = new byte[numberTriplets * 4];
  +        }
   
  +        byte k = 0;
  +        byte l = 0;
  +        byte b1 = 0;
  +        byte b2 = 0;
  +        byte b3 = 0;
           int encodedIndex = 0;
           int dataIndex   = 0;
           int i           = 0;
  -        for ( i = 0; i<numberTriplets; i++ ) {
  +        for (i = 0; i < numberTriplets; i++) {
   
  -            dataIndex = i*3;
  +            dataIndex = i * 3;
               b1 = binaryData[dataIndex];
               b2 = binaryData[dataIndex + 1];
               b3 = binaryData[dataIndex + 2];
   
  -            l  = (byte)(b2 & 0x0f);
  -            k  = (byte)(b1 & 0x03);
  +            l  = (byte) (b2 & 0x0f);
  +            k  = (byte) (b1 & 0x03);
   
  -            encodedIndex = i*4;
  -            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);
  -
  -            encodedData[encodedIndex]   = lookUpBase64Alphabet[ val1 ];
  -            encodedData[encodedIndex+1] = lookUpBase64Alphabet[ val2 | ( k<<4 )];
  -            encodedData[encodedIndex+2] = lookUpBase64Alphabet[ (l <<2 ) | val3 ];
  -            encodedData[encodedIndex+3] = lookUpBase64Alphabet[ b3 & 0x3f ];
  +            encodedIndex = i * 4;
  +            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);
  +
  +            encodedData[encodedIndex]   = lookUpBase64Alphabet[val1];
  +            encodedData[encodedIndex + 1] = lookUpBase64Alphabet[val2
  +                | (k << 4)];
  +            encodedData[encodedIndex + 2] = lookUpBase64Alphabet[(l << 2)
  +                | val3];
  +            encodedData[encodedIndex + 3] = lookUpBase64Alphabet[b3 & 0x3f];
           }
   
           // form integral number of 6-bit groups
  -        dataIndex    = i*3;
  -        encodedIndex = i*4;
  -        if (fewerThan24bits == EIGHTBIT ) {
  +        dataIndex    = i * 3;
  +        encodedIndex = i * 4;
  +        if (fewerThan24bits == EIGHTBIT) {
               b1 = binaryData[dataIndex];
  -            k = (byte) ( b1 &0x03 );
  -            byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
  -            encodedData[encodedIndex]     = lookUpBase64Alphabet[ val1 ];
  -            encodedData[encodedIndex + 1] = lookUpBase64Alphabet[ k<<4 ];
  +            k = (byte) (b1 & 0x03);
  +            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : 
  +                (byte) ((b1) >> 2 ^ 0xc0);
  +            encodedData[encodedIndex]     = lookUpBase64Alphabet[val1];
  +            encodedData[encodedIndex + 1] = lookUpBase64Alphabet[k << 4];
               encodedData[encodedIndex + 2] = PAD;
               encodedData[encodedIndex + 3] = PAD;
  -        } else if ( fewerThan24bits == SIXTEENBIT ) {
  +        } 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 + 1] = lookUpBase64Alphabet[ val2 | ( k<<4 )];
  -            encodedData[encodedIndex + 2] = lookUpBase64Alphabet[ l<<2 ];
  +            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 + 1] = lookUpBase64Alphabet[val2 | 
  +                (k << 4)];
  +            encodedData[encodedIndex + 2] = lookUpBase64Alphabet[l << 2];
               encodedData[encodedIndex + 3] = PAD;
           }
           return encodedData;
  @@ -221,18 +238,20 @@
       /**
        * Decodes Base64 data into octects
        *
  -     * @param binaryData Byte array containing Base64 data
  +     * @param base64Data byte array containing Base64 data
        * @return Array containing decoded data.
        */
  -    public static byte[] decode( byte[] base64Data ) {
  +    public static byte[] decode(byte[] base64Data) {
           // Should we throw away anything not in base64Data ?
   
           // handle the edge case, so we don't have to worry about it later
  -        if(base64Data.length == 0) { return new byte[0]; }
  +        if (base64Data.length == 0) {
  +            return new byte[0];
  +        }
   
  -        int      numberQuadruple    = base64Data.length/FOURBYTE;
  +        int      numberQuadruple    = base64Data.length / FOURBYTE;
           byte     decodedData[]      = null;
  -        byte     b1=0,b2=0,b3=0, b4=0, marker0=0, marker1=0;
  +        byte     b1 = 0, b2 = 0, b3 = 0, b4 = 0, marker0 = 0, marker1 = 0;
   
           int encodedIndex = 0;
           int dataIndex    = 0;
  @@ -240,34 +259,35 @@
               // this block sizes the output array properly - rlw
               int lastData = base64Data.length;
               // ignore the '=' padding
  -            while(base64Data[lastData-1] == PAD) {
  -                if(--lastData == 0) { return new byte[0]; }
  +            while (base64Data[lastData - 1] == PAD) {
  +                if (--lastData == 0) { return new byte[0]; }
               }
  -            decodedData = new byte[ lastData - numberQuadruple ];
  +            decodedData = new byte[lastData - numberQuadruple];
           }
   
  -        for (int i = 0; i<numberQuadruple; i++ ) {
  -            dataIndex = i*4;
  -            marker0   = base64Data[dataIndex +2];
  -            marker1   = base64Data[dataIndex +3];
  +        for (int i = 0; i < numberQuadruple; i++) {
  +            dataIndex = i * 4;
  +            marker0   = base64Data[dataIndex + 2];
  +            marker1   = base64Data[dataIndex + 3];
   
               b1 = base64Alphabet[base64Data[dataIndex]];
  -            b2 = base64Alphabet[base64Data[dataIndex +1]];
  -
  -            if ( marker0 != PAD && marker1 != PAD ) {     //No PAD e.g 3cQl
  -                b3 = base64Alphabet[ marker0 ];
  -                b4 = base64Alphabet[ marker1 ];
  -
  -                decodedData[encodedIndex]   = (byte)(  b1 <<2 | b2>>4 ) ;
  -                decodedData[encodedIndex+1] = (byte)(((b2 & 0xf)<<4 ) |( (b3>>2)
& 0xf) );
  -                decodedData[encodedIndex+2] = (byte)( b3<<6 | b4 );
  -            } else if ( marker0 == PAD ) {               //Two PAD e.g. 3c[Pad][Pad]
  -                decodedData[encodedIndex]   = (byte)(  b1 <<2 | b2>>4 ) ;
  -            } else if ( marker1 == PAD ) {              //One PAD e.g. 3cQ[Pad]
  -                b3 = base64Alphabet[ marker0 ];
  +            b2 = base64Alphabet[base64Data[dataIndex + 1]];
   
  -                decodedData[encodedIndex]   = (byte)(  b1 <<2 | b2>>4 );
  -                decodedData[encodedIndex+1] = (byte)(((b2 & 0xf)<<4 ) |( (b3>>2)
& 0xf) );
  +            if (marker0 != PAD && marker1 != PAD) {     //No PAD e.g 3cQl
  +                b3 = base64Alphabet[marker0];
  +                b4 = base64Alphabet[marker1];
  +
  +                decodedData[encodedIndex]   = (byte) (b1 << 2 | b2 >> 4);
  +                decodedData[encodedIndex + 1] = (byte) (((b2 & 0xf) << 4)
  +                    | ((b3 >> 2) & 0xf));
  +                decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
  +            } else if (marker0 == PAD) {    //Two PAD e.g. 3c[Pad][Pad]
  +                decodedData[encodedIndex]   = (byte) (b1 << 2 | b2 >> 4) ;
  +            } else if (marker1 == PAD) {    //One PAD e.g. 3cQ[Pad]
  +                b3 = base64Alphabet[marker0];
  +                decodedData[encodedIndex]   = (byte) (b1 << 2 | b2 >> 4);
  +                decodedData[encodedIndex + 1] = (byte) (((b2 & 0xf) << 4) 
  +                    | ((b3 >> 2) & 0xf));
               }
               encodedIndex += 3;
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message