Next step: compile jni sources correctly.

8 files changed, 0 insertions, 735 deletions

diff --git a/src/org/spongycastle/util/encoders/Base64.java b/src/org/spongycastle/util/encoders/Base64.java
deleted file mode 100644
index 87bd80a0..00000000
--- a/src/org/spongycastle/util/encoders/Base64.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.spongycastle.util.encoders;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class Base64
-{
-    private static final Encoder encoder = new Base64Encoder();
-    
-    /**
-     * encode the input data producing a base 64 encoded byte array.
-     *
-     * @return a byte array containing the base 64 encoded data.
-     */
-    public static byte[] encode(
-        byte[]    data)
-    {
-        int len = (data.length + 2) / 3 * 4;
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream(len);
-        
-        try
-        {
-            encoder.encode(data, 0, data.length, bOut);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException("exception encoding base64 string: " + e);
-        }
-        
-        return bOut.toByteArray();
-    }
-
-    /**
-     * Encode the byte data to base 64 writing it to the given output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int encode(
-        byte[]                data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.encode(data, 0, data.length, out);
-    }
-    
-    /**
-     * Encode the byte data to base 64 writing it to the given output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int encode(
-        byte[]                data,
-        int                    off,
-        int                    length,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.encode(data, off, length, out);
-    }
-    
-    /**
-     * decode the base 64 encoded input data. It is assumed the input data is valid.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        byte[]    data)
-    {
-        int len = data.length / 4 * 3;
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream(len);
-        
-        try
-        {
-            encoder.decode(data, 0, data.length, bOut);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException("exception decoding base64 string: " + e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * decode the base 64 encoded String data - whitespace will be ignored.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        String    data)
-    {
-        int len = data.length() / 4 * 3;
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream(len);
-        
-        try
-        {
-            encoder.decode(data, bOut);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException("exception decoding base64 string: " + e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * decode the base 64 encoded String data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int decode(
-        String                data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.decode(data, out);
-    }
-}
diff --git a/src/org/spongycastle/util/encoders/Base64Encoder.java b/src/org/spongycastle/util/encoders/Base64Encoder.java
deleted file mode 100644
index 84060707..00000000
--- a/src/org/spongycastle/util/encoders/Base64Encoder.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package org.spongycastle.util.encoders;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class Base64Encoder
-    implements Encoder
-{
-    protected 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)'/'
-        };
-
-    protected byte    padding = (byte)'=';
-    
-    /*
-     * set up the decoding table.
-     */
-    protected final byte[] decodingTable = new byte[128];
-
-    protected void initialiseDecodingTable()
-    {
-        for (int i = 0; i < encodingTable.length; i++)
-        {
-            decodingTable[encodingTable[i]] = (byte)i;
-        }
-    }
-    
-    public Base64Encoder()
-    {
-        initialiseDecodingTable();
-    }
-    
-    /**
-     * encode the input data producing a base 64 output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public int encode(
-        byte[]                data,
-        int                    off,
-        int                    length,
-        OutputStream    out) 
-        throws IOException
-    {
-        int modulus = length % 3;
-        int dataLength = (length - modulus);
-        int a1, a2, a3;
-        
-        for (int i = off; i < off + dataLength; i += 3)
-        {
-            a1 = data[i] & 0xff;
-            a2 = data[i + 1] & 0xff;
-            a3 = data[i + 2] & 0xff;
-
-            out.write(encodingTable[(a1 >>> 2) & 0x3f]);
-            out.write(encodingTable[((a1 << 4) | (a2 >>> 4)) & 0x3f]);
-            out.write(encodingTable[((a2 << 2) | (a3 >>> 6)) & 0x3f]);
-            out.write(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[off + dataLength] & 0xff;
-            b1 = (d1 >>> 2) & 0x3f;
-            b2 = (d1 << 4) & 0x3f;
-
-            out.write(encodingTable[b1]);
-            out.write(encodingTable[b2]);
-            out.write(padding);
-            out.write(padding);
-            break;
-        case 2:
-            d1 = data[off + dataLength] & 0xff;
-            d2 = data[off + dataLength + 1] & 0xff;
-
-            b1 = (d1 >>> 2) & 0x3f;
-            b2 = ((d1 << 4) | (d2 >>> 4)) & 0x3f;
-            b3 = (d2 << 2) & 0x3f;
-
-            out.write(encodingTable[b1]);
-            out.write(encodingTable[b2]);
-            out.write(encodingTable[b3]);
-            out.write(padding);
-            break;
-        }
-
-        return (dataLength / 3) * 4 + ((modulus == 0) ? 0 : 4);
-    }
-
-    private boolean ignore(
-        char    c)
-    {
-        return (c == '\n' || c =='\r' || c == '\t' || c == ' ');
-    }
-    
-    /**
-     * decode the base 64 encoded byte data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public int decode(
-        byte[]          data,
-        int             off,
-        int             length,
-        OutputStream    out)
-        throws IOException
-    {
-        byte    b1, b2, b3, b4;
-        int     outLen = 0;
-        
-        int     end = off + length;
-        
-        while (end > off)
-        {
-            if (!ignore((char)data[end - 1]))
-            {
-                break;
-            }
-            
-            end--;
-        }
-        
-        int  i = off;
-        int  finish = end - 4;
-        
-        i = nextI(data, i, finish);
-
-        while (i < finish)
-        {
-            b1 = decodingTable[data[i++]];
-            
-            i = nextI(data, i, finish);
-            
-            b2 = decodingTable[data[i++]];
-            
-            i = nextI(data, i, finish);
-            
-            b3 = decodingTable[data[i++]];
-            
-            i = nextI(data, i, finish);
-            
-            b4 = decodingTable[data[i++]];
-
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            out.write((b3 << 6) | b4);
-            
-            outLen += 3;
-            
-            i = nextI(data, i, finish);
-        }
-
-        outLen += decodeLastBlock(out, (char)data[end - 4], (char)data[end - 3], (char)data[end - 2], (char)data[end - 1]);
-        
-        return outLen;
-    }
-
-    private int nextI(byte[] data, int i, int finish)
-    {
-        while ((i < finish) && ignore((char)data[i]))
-        {
-            i++;
-        }
-        return i;
-    }
-    
-    /**
-     * decode the base 64 encoded String data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public int decode(
-        String          data,
-        OutputStream    out)
-        throws IOException
-    {
-        byte    b1, b2, b3, b4;
-        int     length = 0;
-        
-        int     end = data.length();
-        
-        while (end > 0)
-        {
-            if (!ignore(data.charAt(end - 1)))
-            {
-                break;
-            }
-            
-            end--;
-        }
-        
-        int  i = 0;
-        int  finish = end - 4;
-        
-        i = nextI(data, i, finish);
-        
-        while (i < finish)
-        {
-            b1 = decodingTable[data.charAt(i++)];
-            
-            i = nextI(data, i, finish);
-            
-            b2 = decodingTable[data.charAt(i++)];
-            
-            i = nextI(data, i, finish);
-            
-            b3 = decodingTable[data.charAt(i++)];
-            
-            i = nextI(data, i, finish);
-            
-            b4 = decodingTable[data.charAt(i++)];
-
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            out.write((b3 << 6) | b4);
-            
-            length += 3;
-            
-            i = nextI(data, i, finish);
-        }
-
-        length += decodeLastBlock(out, data.charAt(end - 4), data.charAt(end - 3), data.charAt(end - 2), data.charAt(end - 1));
-
-        return length;
-    }
-
-    private int decodeLastBlock(OutputStream out, char c1, char c2, char c3, char c4) 
-        throws IOException
-    {
-        byte    b1, b2, b3, b4;
-        
-        if (c3 == padding)
-        {
-            b1 = decodingTable[c1];
-            b2 = decodingTable[c2];
-
-            out.write((b1 << 2) | (b2 >> 4));
-            
-            return 1;
-        }
-        else if (c4 == padding)
-        {
-            b1 = decodingTable[c1];
-            b2 = decodingTable[c2];
-            b3 = decodingTable[c3];
-
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            
-            return 2;
-        }
-        else
-        {
-            b1 = decodingTable[c1];
-            b2 = decodingTable[c2];
-            b3 = decodingTable[c3];
-            b4 = decodingTable[c4];
-
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            out.write((b3 << 6) | b4);
-            
-            return 3;
-        } 
-    }
-
-    private int nextI(String data, int i, int finish)
-    {
-        while ((i < finish) && ignore(data.charAt(i)))
-        {
-            i++;
-        }
-        return i;
-    }
-}
diff --git a/src/org/spongycastle/util/encoders/Encoder.java b/src/org/spongycastle/util/encoders/Encoder.java
deleted file mode 100644
index 106c36b7..00000000
--- a/src/org/spongycastle/util/encoders/Encoder.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.spongycastle.util.encoders;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Encode and decode byte arrays (typically from binary to 7-bit ASCII 
- * encodings).
- */
-public interface Encoder
-{
-    int encode(byte[] data, int off, int length, OutputStream out) throws IOException;
-    
-    int decode(byte[] data, int off, int length, OutputStream out) throws IOException;
-
-    int decode(String data, OutputStream out) throws IOException;
-}
diff --git a/src/org/spongycastle/util/io/pem/PemGenerationException.java b/src/org/spongycastle/util/io/pem/PemGenerationException.java
deleted file mode 100644
index 0127ca0c..00000000
--- a/src/org/spongycastle/util/io/pem/PemGenerationException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.spongycastle.util.io.pem;
-
-import java.io.IOException;
-
-@SuppressWarnings("serial")
-public class PemGenerationException
-    extends IOException
-{
-    private Throwable cause;
-
-    public PemGenerationException(String message, Throwable cause)
-    {
-        super(message);
-        this.cause = cause;
-    }
-
-    public PemGenerationException(String message)
-    {
-        super(message);
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/src/org/spongycastle/util/io/pem/PemHeader.java b/src/org/spongycastle/util/io/pem/PemHeader.java
deleted file mode 100644
index 4adb815e..00000000
--- a/src/org/spongycastle/util/io/pem/PemHeader.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.spongycastle.util.io.pem;
-
-public class PemHeader
-{
-    private String name;
-    private String value;
-
-    public PemHeader(String name, String value)
-    {
-        this.name = name;
-        this.value = value;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public String getValue()
-    {
-        return value;
-    }
-
-    public int hashCode()
-    {
-        return getHashCode(this.name) + 31 * getHashCode(this.value);    
-    }
-
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof PemHeader))
-        {
-            return false;
-        }
-
-        PemHeader other = (PemHeader)o;
-
-        return other == this || (isEqual(this.name, other.name) && isEqual(this.value, other.value));
-    }
-
-    private int getHashCode(String s)
-    {
-        if (s == null)
-        {
-            return 1;
-        }
-
-        return s.hashCode();
-    }
-
-    private boolean isEqual(String s1, String s2)
-    {
-        if (s1 == s2)
-        {
-            return true;
-        }
-
-        if (s1 == null || s2 == null)
-        {
-            return false;
-        }
-
-        return s1.equals(s2);
-    }
-
-}
diff --git a/src/org/spongycastle/util/io/pem/PemObject.java b/src/org/spongycastle/util/io/pem/PemObject.java
deleted file mode 100644
index 6f7c79c5..00000000
--- a/src/org/spongycastle/util/io/pem/PemObject.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.spongycastle.util.io.pem;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-@SuppressWarnings("all")
-public class PemObject
-    implements PemObjectGenerator
-{
-	private static final List EMPTY_LIST = Collections.unmodifiableList(new ArrayList());
-
-    private String type;
-    private List   headers;
-    private byte[] content;
-
-    /**
-     * Generic constructor for object without headers.
-     *
-     * @param type pem object type.
-     * @param content the binary content of the object.
-     */
-    public PemObject(String type, byte[] content)
-    {
-        this(type, EMPTY_LIST, content);
-    }
-
-    /**
-     * Generic constructor for object with headers.
-     *
-     * @param type pem object type.
-     * @param headers a list of PemHeader objects.
-     * @param content the binary content of the object.
-     */
-    public PemObject(String type, List headers, byte[] content)
-    {
-        this.type = type;
-        this.headers = Collections.unmodifiableList(headers);
-        this.content = content;
-    }
-
-    public String getType()
-    {
-        return type;
-    }
-
-    public List getHeaders()
-    {
-        return headers;
-    }
-
-    public byte[] getContent()
-    {
-        return content;
-    }
-
-    public PemObject generate()
-        throws PemGenerationException
-    {
-        return this;
-    }
-}
diff --git a/src/org/spongycastle/util/io/pem/PemObjectGenerator.java b/src/org/spongycastle/util/io/pem/PemObjectGenerator.java
deleted file mode 100644
index 1a8cea6d..00000000
--- a/src/org/spongycastle/util/io/pem/PemObjectGenerator.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.spongycastle.util.io.pem;
-
-public interface PemObjectGenerator
-{
-    PemObject generate()
-        throws PemGenerationException;
-}
diff --git a/src/org/spongycastle/util/io/pem/PemWriter.java b/src/org/spongycastle/util/io/pem/PemWriter.java
deleted file mode 100644
index f5a6a363..00000000
--- a/src/org/spongycastle/util/io/pem/PemWriter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.spongycastle.util.io.pem;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-
-import org.spongycastle.util.encoders.Base64;
-
-/**
- * A generic PEM writer, based on RFC 1421
- */
-@SuppressWarnings("all")
-public class PemWriter
-    extends BufferedWriter
-{
-    private static final int LINE_LENGTH = 64;
-
-    private final int nlLength;
-    private char[]  buf = new char[LINE_LENGTH];
-
-    /**
-     * Base constructor.
-     *
-     * @param out output stream to use.
-     */
-    public PemWriter(Writer out)
-    {
-        super(out);
-
-        String nl = System.getProperty("line.separator");
-        if (nl != null)
-        {
-            nlLength = nl.length();
-        }
-        else
-        {
-            nlLength = 2;
-        }
-    }
-
-    /**
-     * Return the number of bytes or characters required to contain the
-     * passed in object if it is PEM encoded.
-     *
-     * @param obj pem object to be output
-     * @return an estimate of the number of bytes
-     */
-    public int getOutputSize(PemObject obj)
-    {
-        // BEGIN and END boundaries.
-        int size = (2 * (obj.getType().length() + 10 + nlLength)) + 6 + 4;
-
-        if (!obj.getHeaders().isEmpty())
-        {
-            for (Iterator it = obj.getHeaders().iterator(); it.hasNext();)
-            {
-                PemHeader hdr = (PemHeader)it.next();
-
-                size += hdr.getName().length() + ": ".length() + hdr.getValue().length() + nlLength;
-            }
-
-            size += nlLength;
-        }
-
-        // base64 encoding
-        int dataLen = ((obj.getContent().length + 2) / 3) * 4;
-        
-        size += dataLen + (((dataLen + LINE_LENGTH - 1) / LINE_LENGTH) * nlLength);
-
-        return size;
-    }
-    
-    public void writeObject(PemObjectGenerator objGen)
-        throws IOException
-    {
-        PemObject obj = objGen.generate();
-
-        writePreEncapsulationBoundary(obj.getType());
-
-        if (!obj.getHeaders().isEmpty())
-        {
-            for (Iterator it = obj.getHeaders().iterator(); it.hasNext();)
-            {
-                PemHeader hdr = (PemHeader)it.next();
-
-                this.write(hdr.getName());
-                this.write(": ");
-                this.write(hdr.getValue());
-                this.newLine();
-            }
-
-            this.newLine();
-        }
-        
-        writeEncoded(obj.getContent());
-        writePostEncapsulationBoundary(obj.getType());
-    }
-
-    private void writeEncoded(byte[] bytes)
-        throws IOException
-    {
-        bytes = Base64.encode(bytes);
-
-        for (int i = 0; i < bytes.length; i += buf.length)
-        {
-            int index = 0;
-
-            while (index != buf.length)
-            {
-                if ((i + index) >= bytes.length)
-                {
-                    break;
-                }
-                buf[index] = (char)bytes[i + index];
-                index++;
-            }
-            this.write(buf, 0, index);
-            this.newLine();
-        }
-    }
-
-    private void writePreEncapsulationBoundary(
-        String type)
-        throws IOException
-    {
-        this.write("-----BEGIN " + type + "-----");
-        this.newLine();
-    }
-
-    private void writePostEncapsulationBoundary(
-        String type)
-        throws IOException
-    {
-        this.write("-----END " + type + "-----");
-        this.newLine();
-    }
-}