1 files changed, 98 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/util/Arrays.java b/bcprov/src/main/java/org/bouncycastle/util/Arrays.java
index 4564b68..d1c3111 100644
--- a/bcprov/src/main/java/org/bouncycastle/util/Arrays.java
+++ b/bcprov/src/main/java/org/bouncycastle/util/Arrays.java
@@ -238,7 +238,17 @@ public final class Arrays
             array[i] = value;
         }
     }
-    
+
+    public static void fill(
+        char[] array,
+        char value)
+    {
+        for (int i = 0; i < array.length; i++)
+        {
+            array[i] = value;
+        }
+    }
+
     public static void fill(
         long[] array,
         long value)
@@ -307,6 +317,18 @@ public final class Arrays
         return hc;
     }
 
+    public static int hashCode(int[][] ints)
+    {
+        int hc = 0;
+
+        for (int i = 0; i != ints.length; i++)
+        {
+            hc = hc * 257 + hashCode(ints[i]);
+        }
+
+        return hc;
+    }
+
     public static int hashCode(int[] data)
     {
         if (data == null)
@@ -326,6 +348,49 @@ public final class Arrays
         return hc;
     }
 
+    public static int hashCode(short[][][] shorts)
+    {
+        int hc = 0;
+
+        for (int i = 0; i != shorts.length; i++)
+        {
+            hc = hc * 257 + hashCode(shorts[i]);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(short[][] shorts)
+    {
+        int hc = 0;
+
+        for (int i = 0; i != shorts.length; i++)
+        {
+            hc = hc * 257 + hashCode(shorts[i]);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(short[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = data.length;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= (data[i] & 0xff);
+        }
+
+        return hc;
+    }
+
     public static int hashCode(BigInteger[] data)
     {
         if (data == null)
@@ -371,6 +436,19 @@ public final class Arrays
         return copy;
     }
 
+    public static short[] clone(short[] data)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+        short[] copy = new short[data.length];
+
+        System.arraycopy(data, 0, copy, 0, data.length);
+
+        return copy;
+    }
+
     public static BigInteger[] clone(BigInteger[] data)
     {
         if (data == null)
@@ -400,6 +478,22 @@ public final class Arrays
         return tmp;
     }
 
+    public static char[] copyOf(char[] data, int newLength)
+    {
+        char[] tmp = new char[newLength];
+
+        if (newLength < data.length)
+        {
+            System.arraycopy(data, 0, tmp, 0, newLength);
+        }
+        else
+        {
+            System.arraycopy(data, 0, tmp, 0, data.length);
+        }
+
+        return tmp;
+    }
+
     public static int[] copyOf(int[] data, int newLength)
     {
         int[] tmp = new int[newLength];
@@ -525,7 +619,9 @@ public final class Arrays
         int newLength = to - from;
         if (newLength < 0)
         {
-            throw new IllegalArgumentException(from + " > " + to);
+			StringBuffer sb = new StringBuffer(from);
+			sb.append(" > ").append(to);
+            throw new IllegalArgumentException(sb.toString());
         }
         return newLength;
     }