J2ME changes

Author: dghgit

buildj2me

@@ -83,7 +83,10 @@ then
         rm -rf src/org/bouncycastle/pqc/crypto/*/BitStringTest*
         rm -rf src/org/bouncycastle/pqc/crypto/*/IndexGenerator*
         rm -rf src/org/bouncycastle/pqc/crypto/xmss
+        rm -rf src/org/bouncycastle/pqc/crypto/lms
         rm -rf src/org/bouncycastle/pqc/crypto/test/XMSS*
+        rm -rf src/org/bouncycastle/pqc/crypto/test/LMS*
+        rm -rf src/org/bouncycastle/pqc/crypto/test/HSS*
         rm src/org/bouncycastle/pqc/crypto/qtesla/QTeslaKeyEncodingTests.java
         rm -rf src/org/bouncycastle/gpg/keybox
         rm -rf src/org/bouncycastle/gpg/test

core/src/main/j2me/org/bouncycastle/asn1/StreamUtil.java

@@ -16,7 +16,7 @@ static int findLimit(InputStream in)
     {
         if (in instanceof LimitedInputStream)
         {
-            return ((LimitedInputStream)in).getRemaining();
+            return ((LimitedInputStream)in).getLimit();
         }
         else if (in instanceof ASN1InputStream)
         {

core/src/main/j2me/org/bouncycastle/crypto/macs/SipHash128.java

@@ -0,0 +1,85 @@
+package org.bouncycastle.crypto.macs;
+
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.util.Pack;
+
+/**
+ * Implementation of SipHash with 128 bit output.
+ * <p>
+ * Based on the {@link SipHash} and the C reference implementation
+ * https://github.com/veorq/SipHash.
+ * 
+ */
+public class SipHash128
+    extends SipHash
+{
+
+    /**
+     * SipHash128-2-4
+     */
+    public SipHash128()
+    {
+      super();
+    }
+
+    /**
+     * SipHash128-c-d
+     *
+     * @param c the number of compression rounds
+     * @param d the number of finalization rounds
+     */
+    public SipHash128(int c, int d)
+    {
+       super(c, d);
+    }
+
+    public String getAlgorithmName()
+    {
+        return "SipHash128-" + c + "-" + d;
+    }
+
+    public int getMacSize()
+    {
+        return 16;
+    }
+
+    public long doFinal()
+        throws DataLengthException, IllegalStateException {
+        throw new IllegalStateException("doFinal() is not supported");
+    }
+
+    public int doFinal(byte[] out, int outOff)
+        throws DataLengthException, IllegalStateException
+    {
+        // NOTE: 2 distinct shifts to avoid "64-bit shift" when wordPos == 0
+        m >>>= ((7 - wordPos) << 3);
+        m >>>= 8;
+        m |= (((wordCount << 3) + wordPos) & 0xffL) << 56;
+
+        processMessageWord();
+
+        v2 ^= 0xeeL;
+
+        applySipRounds(d);
+
+        long r0 = v0 ^ v1 ^ v2 ^ v3;
+
+        v1 ^= 0xddL;
+        applySipRounds(d);
+
+        long r1 = v0 ^ v1 ^ v2 ^ v3;
+
+        reset();
+
+        Pack.longToLittleEndian(r0, out, outOff);
+        Pack.longToLittleEndian(r1, out, outOff + 8);
+        return 16;
+    }
+
+    public void reset()
+    {
+        super.reset();
+        v1 ^= 0xeeL;
+    }
+
+}

core/src/main/j2me/org/bouncycastle/util/Properties.java

@@ -1,18 +1,67 @@
 package org.bouncycastle.util;
 
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
 /**
  * Utility method for accessing system properties.
  */
 public class Properties
 {
-    public static boolean isOverrideSet(final String propertyName)
+    private Properties()
+    {
+    }
+
+    /**
+     * Return whether a particular override has been set to true.
+     *
+     * @param propertyName the property name for the override.
+     * @return true if the property is set to "true", false otherwise.
+     */
+    public static boolean isOverrideSet(String propertyName)
+    {
+            String p = getPropertyValue(propertyName);
+
+            return "true".equalsIgnoreCase(p);
+    }
+
+    public static BigInteger asBigInteger(String propertyName)
+    {
+        String p = getPropertyValue(propertyName);
+
+        if (p != null)
+        {
+            return new BigInteger(p);
+        }
+
+        return null;
+    }
+
+    public static Set<String> asKeySet(String propertyName)
     {
-	    String value = System.getProperty(propertyName);
-	    if (value == null)
-	    {
-		return false;
-	    }
+        Set<String> set = new HashSet<String>();
+
+        String p = getPropertyValue(propertyName);
 
-	    return "true".equals(Strings.toLowerCase(value));
+        if (p != null)
+        {
+            StringTokenizer sTok = new StringTokenizer(p, ",");
+            while (sTok.hasMoreElements())
+            {
+                set.add(Strings.toLowerCase(sTok.nextToken()).trim());
+            }
+        }
+
+        return Collections.unmodifiableSet(set);
+    }
+
+    public static String getPropertyValue(final String propertyName)
+    {
+	return System.getProperty(propertyName);
     }
 }

core/src/main/j2me/org/bouncycastle/util/test/SimpleTest.java

@@ -128,6 +128,11 @@ protected boolean areEqual(
     {
         return Arrays.areEqual(a, b);
     }
+
+    protected boolean areEqual(byte[] a, int aFromIndex, int aToIndex, byte[] b, int bFromIndex, int bToIndex)
+    {
+        return Arrays.areEqual(a, aFromIndex, aToIndex, b, bFromIndex, bToIndex);
+    }
 
     public TestResult perform()
     {