added Base64.java, fixed package names

darcs-hash:20040412000045-5007d-0eda889c990f10345f612aa1ed0371d52b384401.gz

diff --git a/src/org/ibex/crypto/Base64.java b/src/org/ibex/crypto/Base64.java
new file mode 100644 (file)
index 0000000..f53b067
--- /dev/null
+++ b/src/org/ibex/crypto/Base64.java
@@ -0,0 +1,254 @@
+package org.ibex.crypto;
+
+public class Base64
+{
+        private static final byte[] encodingTable =
+                {
+                    (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
+            (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
+            (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
+            (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
+                    (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
+            (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
+            (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
+            (byte)'v',
+                    (byte)'w', (byte)'x', (byte)'y', (byte)'z',
+                    (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6',
+            (byte)'7', (byte)'8', (byte)'9',
+                    (byte)'+', (byte)'/'
+                };
+
+        /**
+         * encode the input data producong a base 64 encoded byte array.
+         *
+         * @return a byte array containing the base 64 encoded data.
+         */
+        public static byte[] encode(
+                byte[]  data)
+        {
+                byte[]  bytes;
+                
+                int modulus = data.length % 3;
+                if (modulus == 0)
+                {
+                        bytes = new byte[4 * data.length / 3];
+                }
+                else
+                {
+                        bytes = new byte[4 * ((data.length / 3) + 1)];
+                }
+
+        int dataLength = (data.length - modulus);
+                int a1, a2, a3;
+                for (int i = 0, j = 0; i < dataLength; i += 3, j += 4)
+                {
+                        a1 = data[i] & 0xff;
+                        a2 = data[i + 1] & 0xff;
+                        a3 = data[i + 2] & 0xff;
+
+                        bytes[j] = encodingTable[(a1 >>> 2) & 0x3f];
+                        bytes[j + 1] = encodingTable[((a1 << 4) | (a2 >>> 4)) & 0x3f];
+                        bytes[j + 2] = encodingTable[((a2 << 2) | (a3 >>> 6)) & 0x3f];
+                        bytes[j + 3] = encodingTable[a3 & 0x3f];
+                }
+
+                /*
+                 * process the tail end.
+                 */
+                int     b1, b2, b3;
+                int     d1, d2;
+
+                switch (modulus)
+                {
+                case 0:         /* nothing left to do */
+                        break;
+                case 1:
+                        d1 = data[data.length - 1] & 0xff;
+                        b1 = (d1 >>> 2) & 0x3f;
+                        b2 = (d1 << 4) & 0x3f;
+
+                        bytes[bytes.length - 4] = encodingTable[b1];
+                        bytes[bytes.length - 3] = encodingTable[b2];
+                        bytes[bytes.length - 2] = (byte)'=';
+                        bytes[bytes.length - 1] = (byte)'=';
+                        break;
+                case 2:
+                        d1 = data[data.length - 2] & 0xff;
+                        d2 = data[data.length - 1] & 0xff;
+
+                        b1 = (d1 >>> 2) & 0x3f;
+                        b2 = ((d1 << 4) | (d2 >>> 4)) & 0x3f;
+                        b3 = (d2 << 2) & 0x3f;
+
+                        bytes[bytes.length - 4] = encodingTable[b1];
+                        bytes[bytes.length - 3] = encodingTable[b2];
+                        bytes[bytes.length - 2] = encodingTable[b3];
+                        bytes[bytes.length - 1] = (byte)'=';
+                        break;
+                }
+
+                return bytes;
+        }
+
+        /*
+         * set up the decoding table.
+         */
+        private static final byte[] decodingTable;
+
+        static
+        {
+                decodingTable = new byte[128];
+
+                for (int i = 'A'; i <= 'Z'; i++)
+                {
+                        decodingTable[i] = (byte)(i - 'A');
+                }
+
+                for (int i = 'a'; i <= 'z'; i++)
+                {
+                        decodingTable[i] = (byte)(i - 'a' + 26);
+                }
+
+                for (int i = '0'; i <= '9'; i++)
+                {
+                        decodingTable[i] = (byte)(i - '0' + 52);
+                }
+
+                decodingTable['+'] = 62;
+                decodingTable['/'] = 63;
+        }
+
+        /**
+         * decode the base 64 encoded input data.
+         *
+         * @return a byte array representing the decoded data.
+         */
+        public static byte[] decode(
+                byte[]  data)
+        {
+                byte[]  bytes;
+                byte    b1, b2, b3, b4;
+
+                if (data[data.length - 2] == '=')
+                {
+                        bytes = new byte[(((data.length / 4) - 1) * 3) + 1];
+                }
+                else if (data[data.length - 1] == '=')
+                {
+                        bytes = new byte[(((data.length / 4) - 1) * 3) + 2];
+                }
+                else
+                {
+                        bytes = new byte[((data.length / 4) * 3)];
+                }
+
+                for (int i = 0, j = 0; i < data.length - 4; i += 4, j += 3)
+                {
+                        b1 = decodingTable[data[i]];
+                        b2 = decodingTable[data[i + 1]];
+                        b3 = decodingTable[data[i + 2]];
+                        b4 = decodingTable[data[i + 3]];
+
+                        bytes[j] = (byte)((b1 << 2) | (b2 >> 4));
+                        bytes[j + 1] = (byte)((b2 << 4) | (b3 >> 2));
+                        bytes[j + 2] = (byte)((b3 << 6) | b4);
+                }
+
+                if (data[data.length - 2] == '=')
+                {
+                        b1 = decodingTable[data[data.length - 4]];
+                        b2 = decodingTable[data[data.length - 3]];
+
+                        bytes[bytes.length - 1] = (byte)((b1 << 2) | (b2 >> 4));
+                }
+                else if (data[data.length - 1] == '=')
+                {
+                        b1 = decodingTable[data[data.length - 4]];
+                        b2 = decodingTable[data[data.length - 3]];
+                        b3 = decodingTable[data[data.length - 2]];
+
+                        bytes[bytes.length - 2] = (byte)((b1 << 2) | (b2 >> 4));
+                        bytes[bytes.length - 1] = (byte)((b2 << 4) | (b3 >> 2));
+                }
+                else
+                {
+                        b1 = decodingTable[data[data.length - 4]];
+                        b2 = decodingTable[data[data.length - 3]];
+                        b3 = decodingTable[data[data.length - 2]];
+                        b4 = decodingTable[data[data.length - 1]];
+
+                        bytes[bytes.length - 3] = (byte)((b1 << 2) | (b2 >> 4));
+                        bytes[bytes.length - 2] = (byte)((b2 << 4) | (b3 >> 2));
+                        bytes[bytes.length - 1] = (byte)((b3 << 6) | b4);
+                }
+
+                return bytes;
+        }
+
+        /**
+         * decode the base 64 encoded String data.
+         *
+         * @return a byte array representing the decoded data.
+         */
+        public static byte[] decode(
+                String  data)
+        {
+                byte[]  bytes;
+                byte    b1, b2, b3, b4;
+
+                if (data.charAt(data.length() - 2) == '=')
+                {
+                        bytes = new byte[(((data.length() / 4) - 1) * 3) + 1];
+                }
+                else if (data.charAt(data.length() - 1) == '=')
+                {
+                        bytes = new byte[(((data.length() / 4) - 1) * 3) + 2];
+                }
+                else
+                {
+                        bytes = new byte[((data.length() / 4) * 3)];
+                }
+
+                for (int i = 0, j = 0; i < data.length() - 4; i += 4, j += 3)
+                {
+                        b1 = decodingTable[data.charAt(i)];
+                        b2 = decodingTable[data.charAt(i + 1)];
+                        b3 = decodingTable[data.charAt(i + 2)];
+                        b4 = decodingTable[data.charAt(i + 3)];
+
+                        bytes[j] = (byte)((b1 << 2) | (b2 >> 4));
+                        bytes[j + 1] = (byte)((b2 << 4) | (b3 >> 2));
+                        bytes[j + 2] = (byte)((b3 << 6) | b4);
+                }
+
+                if (data.charAt(data.length() - 2) == '=')
+                {
+                        b1 = decodingTable[data.charAt(data.length() - 4)];
+                        b2 = decodingTable[data.charAt(data.length() - 3)];
+
+                        bytes[bytes.length - 1] = (byte)((b1 << 2) | (b2 >> 4));
+                }
+                else if (data.charAt(data.length() - 1) == '=')
+                {
+                        b1 = decodingTable[data.charAt(data.length() - 4)];
+                        b2 = decodingTable[data.charAt(data.length() - 3)];
+                        b3 = decodingTable[data.charAt(data.length() - 2)];
+
+                        bytes[bytes.length - 2] = (byte)((b1 << 2) | (b2 >> 4));
+                        bytes[bytes.length - 1] = (byte)((b2 << 4) | (b3 >> 2));
+                }
+                else
+                {
+                        b1 = decodingTable[data.charAt(data.length() - 4)];
+                        b2 = decodingTable[data.charAt(data.length() - 3)];
+                        b3 = decodingTable[data.charAt(data.length() - 2)];
+                        b4 = decodingTable[data.charAt(data.length() - 1)];
+
+                        bytes[bytes.length - 3] = (byte)((b1 << 2) | (b2 >> 4));
+                        bytes[bytes.length - 2] = (byte)((b2 << 4) | (b3 >> 2));
+                        bytes[bytes.length - 1] = (byte)((b3 << 6) | b4);
+                }
+
+                return bytes;
+        }
+}

diff --git a/src/org/ibex/crypto/DER.java b/src/org/ibex/crypto/DER.java
index 4fba365..6e3ca1a 100644 (file)
--- a/src/org/ibex/crypto/DER.java
+++ b/src/org/ibex/crypto/DER.java
@@ -24,7 +24,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  */
-package org.ibex.der;
+package org.ibex.crypto;
 import java.io.IOException;
 import java.io.*;
 import java.text.ParseException;

diff --git a/src/org/ibex/crypto/Digest.java b/src/org/ibex/crypto/Digest.java
index 15506fe..3b71fe8 100644 (file)
--- a/src/org/ibex/crypto/Digest.java
+++ b/src/org/ibex/crypto/Digest.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.brian_web.crypto;
+package org.ibex.crypto;
 
 /**
  * base implementation of MD4 family style digest as outlined in

diff --git a/src/org/ibex/crypto/HMAC.java b/src/org/ibex/crypto/HMAC.java
index f6ec2f8..d7da4c8 100644 (file)
--- a/src/org/ibex/crypto/HMAC.java
+++ b/src/org/ibex/crypto/HMAC.java
@@ -1,4 +1,4 @@
-package com.brian_web.crypto;
+package org.ibex.crypto;
 
 public class HMAC extends Digest {
     private final Digest h;

diff --git a/src/org/ibex/crypto/MD2.java b/src/org/ibex/crypto/MD2.java
index 7e5da64..700824c 100644 (file)
--- a/src/org/ibex/crypto/MD2.java
+++ b/src/org/ibex/crypto/MD2.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.brian_web.crypto;
+package org.ibex.crypto;
 
 /* implementation of MD2
  * as outlined in RFC1319 by B.Kaliski from RSA Laboratories April 1992

diff --git a/src/org/ibex/crypto/MD5.java b/src/org/ibex/crypto/MD5.java
index 12f1ffd..1aa50da 100644 (file)
--- a/src/org/ibex/crypto/MD5.java
+++ b/src/org/ibex/crypto/MD5.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.brian_web.crypto;
+package org.ibex.crypto;
 
 /**
  * implementation of MD5 as outlined in "Handbook of Applied Cryptography", pages 346 - 347.

diff --git a/src/org/ibex/crypto/PKCS1.java b/src/org/ibex/crypto/PKCS1.java
index f5d0759..054f538 100644 (file)
--- a/src/org/ibex/crypto/PKCS1.java
+++ b/src/org/ibex/crypto/PKCS1.java
@@ -1,5 +1,4 @@
-package com.brian_web.crypto;
-
+package org.ibex.crypto;
 import java.security.SecureRandom;
 
 public class PKCS1 {

diff --git a/src/org/ibex/crypto/RC4.java b/src/org/ibex/crypto/RC4.java
index 6899ae1..be6f821 100644 (file)
--- a/src/org/ibex/crypto/RC4.java
+++ b/src/org/ibex/crypto/RC4.java
@@ -1,4 +1,4 @@
-package com.brian_web.crypto;
+package org.ibex.crypto;
 
 
 public class RC4 {

diff --git a/src/org/ibex/crypto/RSA.java b/src/org/ibex/crypto/RSA.java
index 31d613d..1740d1b 100644 (file)
--- a/src/org/ibex/crypto/RSA.java
+++ b/src/org/ibex/crypto/RSA.java
@@ -1,5 +1,4 @@
-package com.brian_web.crypto;
-
+package org.ibex.crypto;
 import java.math.BigInteger;
 
 public class RSA {

diff --git a/src/org/ibex/crypto/SHA1.java b/src/org/ibex/crypto/SHA1.java
index e2ab369..234a8b8 100644 (file)
--- a/src/org/ibex/crypto/SHA1.java
+++ b/src/org/ibex/crypto/SHA1.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.brian_web.crypto;
+package org.ibex.crypto;
 
 /**
  * implementation of SHA-1 as outlined in "Handbook of Applied Cryptography", pages 346 - 349.

diff --git a/src/org/ibex/crypto/X509.java b/src/org/ibex/crypto/X509.java
index 6fed220..2c1326d 100644 (file)
--- a/src/org/ibex/crypto/X509.java
+++ b/src/org/ibex/crypto/X509.java
@@ -25,10 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.brian_web.x509;
-
-import com.brian_web.der.*;
-import com.brian_web.crypto.*;
+package org.ibex.crypto;
 
 import java.io.*;
 import java.util.*;