Java 4, Java 5 compatibility changes. Minor cleanups.

Author: dghgit

ant/jdk14.xml

@@ -31,7 +31,7 @@
                 <exclude name="**/rainbow/*.java"/>
                 <exclude name="**/Rainbow*.java"/>
                 <exclude name="**/PhotonBeetle*.java"/>
-                <exclude name="**/ISAP*.java"/>
+                <exclude name="**/ISAPEngine*.java"/>
                 <exclude name="**/Xoodyak*.java"/>
                 <exclude name="**/Elephant*.java"/>
                 <exclude name="**/Sparkle*.java"/>
@@ -45,6 +45,8 @@
             <fileset dir="pkix/src/main/java">
                 <exclude name="**/JceAADStream.java"/>
                 <exclude name="**/JceKeyTransAuthEnvelopedRecipient.java"/>
+                <exclude name="**/BcHssLmsContentSignerB*.java"/>
+                <exclude name="**/BcHssLmsContentVerifierProviderBuilder.java"/>
 		<exclude name="**/its/**/*.java"/>
                 <exclude name="**/est/**/*.java"/>
                 <exclude name="**/pkix/jcajce/*.java"/>

bc-build.properties

@@ -3,9 +3,9 @@
 # intended to hold user-specific settings that are *not* committed to 
 # the repository.
 
-release.suffix: 1.80
-release.name: 1.80
-release.version: 1.80
+release.suffix: 1.81
+release.name: 1.81
+release.version: 1.81
 release.debug: false
 
 mail.jar.home: ./libs/javax.mail-1.4.7.jar

core/src/main/java/org/bouncycastle/crypto/kems/SAKKEKEMSGenerator.java

@@ -1,5 +1,8 @@
 package org.bouncycastle.crypto.kems;
 
+import java.math.BigInteger;
+import java.security.SecureRandom;
+
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.EncapsulatedSecretGenerator;
 import org.bouncycastle.crypto.SecretWithEncapsulation;
@@ -10,9 +13,6 @@
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.BigIntegers;
 
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
 /**
  * This class implements the SAKKE (Sakai-Kasahara Key Encryption) Key Encapsulation Mechanism
  * as defined in RFC 6508. It generates an encapsulated shared secret value (SSV) using
@@ -146,7 +146,7 @@ static BigInteger hashToIntegerRange(byte[] input, BigInteger q, Digest digest)
         // Step 1: Compute A = hashfn(s)
         digest.update(input, 0, input.length);
         digest.doFinal(hash, 0);
-        byte[] A = hash.clone();
+        byte[] A = Arrays.clone(hash);
 
         // Step 2: Initialize h_0 to all-zero bytes of hashlen size
         byte[] h = new byte[digest.getDigestSize()];

core/src/main/java/org/bouncycastle/pqc/crypto/snova/SnovaEngine.java

@@ -11,6 +11,7 @@
 import org.bouncycastle.crypto.params.ParametersWithIV;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.GF16;
+import org.bouncycastle.util.Integers;
 import org.bouncycastle.util.Pack;
 
 class SnovaEngine
@@ -39,7 +40,7 @@ public SnovaEngine(SnovaParameters params)
         this.o = params.getO();
         this.alpha = params.getAlpha();
         this.n = params.getN();
-        if (!xSSet.containsKey(l))
+        if (!xSSet.containsKey(Integers.valueOf(l)))
         {
             byte[][] S = new byte[l][lsq];
             int[][] xS = new int[l][lsq];
@@ -57,12 +58,12 @@ public SnovaEngine(SnovaParameters params)
                     xS[index][ij] = GF16Utils.gf16FromNibble(S[index][ij]);
                 }
             }
-            sSet.put(l, S);
-            xSSet.put(l, xS);
+            sSet.put(Integers.valueOf(l), S);
+            xSSet.put(Integers.valueOf(l), xS);
         }
-        S = sSet.get(l);
-        xS = xSSet.get(l);
-        if (l < 4 && !fixedAbqSet.containsKey(o))
+        S = (byte[][])sSet.get(Integers.valueOf(l));
+        xS = (int[][])xSSet.get(Integers.valueOf(l));
+        if (l < 4 && !fixedAbqSet.containsKey(Integers.valueOf(o)))
         {
             int alphaxl = alpha * l;
             int alphaxlsq = alphaxl * l;
@@ -88,7 +89,7 @@ public SnovaEngine(SnovaParameters params)
                     genAFqS(q12, oxalphaxl + axl, fixedAbq, (oxalphaxlsq << 1) + oxalphaxlsq + axlsq);
                 }
             }
-            fixedAbqSet.put(o, fixedAbq);
+            fixedAbqSet.put(Integers.valueOf(o), fixedAbq);
         }
     }
 
@@ -564,7 +565,7 @@ public void genABQP(MapGroup1 map1, byte[] pkSeed)
         else
         {
             int oxalphaxlsq = o * alpha * lsq;
-            byte[] fixedAbq = fixedAbqSet.get(o);
+            byte[] fixedAbq = (byte[])fixedAbqSet.get(Integers.valueOf(o));
             MapGroup1.fillAlpha(fixedAbq, 0, map1.aAlpha, m * oxalphaxlsq);
             MapGroup1.fillAlpha(fixedAbq, oxalphaxlsq, map1.bAlpha, (m - 1) * oxalphaxlsq);
             MapGroup1.fillAlpha(fixedAbq, oxalphaxlsq * 2, map1.qAlpha1, (m - 2) * oxalphaxlsq);