compatibility updates

Author: dghgit

core/src/main/java/org/bouncycastle/crypto/engines/Grain128AEADEngine.java

@@ -553,7 +553,8 @@ public byte[] getBuf()
         public void erase()
         {
             Arrays.fill(this.buf, (byte)0);
-            reset();
+            // this for JVM compatibility
+            this.reset();
         }
     }
 }

core/src/main/java/org/bouncycastle/pqc/crypto/picnic/LowmcConstants.java

@@ -1,5 +1,6 @@
 package org.bouncycastle.pqc.crypto.picnic;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
@@ -195,8 +196,7 @@ class LowmcConstants
     static private int[] ReadFromProperty(Properties props, String key, int intSize)
     {
         String s = props.getProperty(key);
-        s = s.replaceAll(",", "");
-        byte[] bytes = Hex.decode(s);
+        byte[] bytes = Hex.decode(removeCommas(s));
         int[] ints = new int[intSize];
         for (int i = 0; i < bytes.length / 4; i++)
         {
@@ -205,6 +205,21 @@ static private int[] ReadFromProperty(Properties props, String key, int intSize)
         return ints;
     }
 
+    private static byte[] removeCommas(String s)
+    {
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        for (int i = 0; i != s.length(); i++)
+        {
+            if (s.charAt(i) == ',')
+            {
+                continue;
+            }
+            bOut.write(s.charAt(i));
+
+        }
+        return bOut.toByteArray();
+    }
+
     // Functions to return individual matricies and round constants
 
     /* Return a pointer to the r-th matrix. The caller must know the dimensions */

core/src/test/java/org/bouncycastle/crypto/test/Grain128AEADTest.java

@@ -39,14 +39,13 @@ private void testVectors()
         InputStream src = Grain128AEADTest.class.getResourceAsStream("/org/bouncycastle/crypto/test/LWC_AEAD_KAT_128_96.txt");
         BufferedReader bin = new BufferedReader(new InputStreamReader(src));
         String line;
-        String[] data;
         byte[] ptByte, adByte;
         byte[] rv;
         HashMap<String, String> map = new HashMap<String, String>();
         while ((line = bin.readLine()) != null)
         {
-            data = line.split(" ");
-            if (data.length == 1)
+            int a = line.indexOf('=');
+            if (a < 0)
             {
                 params = new ParametersWithIV(new KeyParameter(Hex.decode((String)map.get("Key"))), Hex.decode((String)map.get("Nonce")));
                 grain.init(true, params);
@@ -65,14 +64,7 @@ private void testVectors()
             }
             else
             {
-                if (data.length >= 3)
-                {
-                    map.put(data[0].trim(), data[2].trim());
-                }
-                else
-                {
-                    map.put(data[0].trim(), "");
-                }
+                map.put(line.substring(0, a).trim(), line.substring(a + 1).trim());
             }
         }
     }

core/src/test/java/org/bouncycastle/pqc/crypto/test/SNTRUPrimeTest.java

@@ -48,17 +48,19 @@ public void testKEM()
             {
                 if (! line.startsWith("count"))
                     continue;
-                int count = Integer.parseInt(line.split("=")[1].trim());
-                line = resourceReader.readLine();
-                byte[] seed = Hex.decode(line.split("=")[1].trim());
-                line = resourceReader.readLine();
-                byte[] pk = Hex.decode(line.split("=")[1].trim());
-                line = resourceReader.readLine();
-                byte[] sk = Hex.decode(line.split("=")[1].trim());
-                line = resourceReader.readLine();
-                byte[] ct = Hex.decode(line.split("=")[1].trim());
-                line = resourceReader.readLine();
-                byte[] ss = Hex.decode(line.split("=")[1].trim());
+
+                int a = line.indexOf("=");
+                int count = Integer.parseInt(line.substring(a + 1).trim());
+                line = resourceReader.readLine(); a = line.indexOf("=");
+                byte[] seed = Hex.decode(line.substring(a + 1).trim());
+                line = resourceReader.readLine(); a = line.indexOf("=");
+                byte[] pk = Hex.decode(line.substring(a + 1).trim());
+                line = resourceReader.readLine(); a = line.indexOf("=");
+                byte[] sk = Hex.decode(line.substring(a + 1).trim());
+                line = resourceReader.readLine(); a = line.indexOf("=");
+                byte[] ct = Hex.decode(line.substring(a + 1).trim());
+                line = resourceReader.readLine(); a = line.indexOf("=");
+                byte[] ss = Hex.decode(line.substring(a + 1).trim());
 
                 if (sampler.skipTest(count))
                 {

util/src/main/java/org/bouncycastle/asn1/cmp/CertAnnContent.java

@@ -68,7 +68,7 @@ public static CertAnnContent getInstance(Object o)
             }
             catch (IOException e)
             {
-                throw new RuntimeException(e.getMessage(), e);
+                throw new IllegalArgumentException(e.getMessage(), e);
             }
         }
 

util/src/main/java/org/bouncycastle/asn1/cmp/OOBCert.java

@@ -63,7 +63,7 @@ public static OOBCert getInstance(Object o)
             }
             catch (IOException e)
             {
-                throw new RuntimeException(e.getMessage(), e);
+                throw new IllegalArgumentException(e.getMessage(), e);
             }
         }
 

util/src/main/jdk1.4/org/bouncycastle/asn1/cmp/CertAnnContent.java

@@ -68,7 +68,7 @@ public static CMPCertificate getInstance(Object o)
             }
             catch (IOException e)
             {
-                throw new RuntimeException(e.getMessage(), e);
+                throw new IllegalArgumentException(e.getMessage());
             }
         }
 

util/src/main/jdk1.4/org/bouncycastle/asn1/cmp/OOBCert.java

@@ -63,7 +63,7 @@ public static CMPCertificate getInstance(Object o)
             }
             catch (IOException e)
             {
-                throw new RuntimeException(e.getMessage(), e);
+                throw new IllegalArgumentException(e.getMessage());
             }
         }