cleanup/compatibility changes

Author: dghgit

core/src/main/java/org/bouncycastle/pqc/crypto/falcon/FalconParameters.java

@@ -14,7 +14,10 @@ public class FalconParameters
 
     private FalconParameters(String name, int logn, int nonce_length)
     {
-        assert logn > 0 && logn <= 10 : "Log N degree should be between 1 and 10";
+        if (logn > 0 && logn <= 10)
+        {
+            throw new IllegalArgumentException("Log N degree should be between 1 and 10");
+        }
         this.name = name;
         this.logn = logn;
         this.nonce_length = nonce_length;

core/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUKEMExtractor.java

@@ -30,7 +30,7 @@ public NTRUKEMExtractor(NTRUPrivateKeyParameters ntruPrivateKey)
     @Override
     public byte[] extractSecret(byte[] encapsulation)
     {
-        assert this.ntruPrivateKey != null;
+//        assert this.ntruPrivateKey != null;
         NTRUParameterSet parameterSet = this.params.parameterSet;
 
         byte[] sk = this.ntruPrivateKey.privateKey;

core/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUKeyPairGenerator.java

@@ -29,7 +29,7 @@ public void init(KeyGenerationParameters param)
     @Override
     public AsymmetricCipherKeyPair generateKeyPair()
     {
-        assert this.random != null;
+//        assert this.random != null;
         NTRUParameterSet parameterSet = this.params.getParameters().parameterSet;
         byte[] seed = new byte[parameterSet.sampleFgBytes()];
         random.nextBytes(seed);

core/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSampling.java

@@ -34,7 +34,7 @@ public NTRUSampling(NTRUParameterSet params)
      */
     public PolynomialPair sampleFg(byte[] uniformBytes)
     {
-        assert uniformBytes.length == this.params.sampleFgBytes();
+        // assert uniformBytes.length == this.params.sampleFgBytes();
         if (this.params instanceof NTRUHRSSParameterSet)
         {
             HRSSPolynomial f = this.sampleIidPlus(Arrays.copyOfRange(uniformBytes, 0, this.params.sampleIidBytes()));
@@ -62,7 +62,7 @@ else if (this.params instanceof NTRUHPSParameterSet)
      */
     public PolynomialPair sampleRm(byte[] uniformBytes)
     {
-        assert uniformBytes.length == this.params.sampleRmBytes();
+        // assert uniformBytes.length == this.params.sampleRmBytes();
         if (this.params instanceof NTRUHRSSParameterSet)
         {
             HRSSPolynomial r = (HRSSPolynomial)this.sampleIid(Arrays.copyOfRange(uniformBytes, 0, this.params.sampleIidBytes()));
@@ -88,7 +88,7 @@ else if (this.params instanceof NTRUHPSParameterSet)
      */
     public Polynomial sampleIid(byte[] uniformBytes)
     {
-        assert uniformBytes.length == this.params.sampleIidBytes();
+        // assert uniformBytes.length == this.params.sampleIidBytes();
         Polynomial r = this.params.createPolynomial();
         for (int i = 0; i < this.params.n() - 1; i++)
         {
@@ -105,7 +105,7 @@ public Polynomial sampleIid(byte[] uniformBytes)
      */
     public HPSPolynomial sampleFixedType(byte[] uniformBytes)
     {
-        assert uniformBytes.length == this.params.sampleFixedTypeBytes();
+        // assert uniformBytes.length == this.params.sampleFixedTypeBytes();
         int n = this.params.n();
         int weight = ((NTRUHPSParameterSet)this.params).weight();
         HPSPolynomial r = new HPSPolynomial((NTRUHPSParameterSet)this.params);
@@ -156,7 +156,7 @@ public HPSPolynomial sampleFixedType(byte[] uniformBytes)
      */
     public HRSSPolynomial sampleIidPlus(byte[] uniformBytes)
     {
-        assert uniformBytes.length == this.params.sampleIidBytes();
+        // assert uniformBytes.length == this.params.sampleIidBytes();
         int n = this.params.n();
         int i;
         short s = 0;

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

@@ -188,8 +188,9 @@ private void runTest(RadixConversionArgument arg, RadixConverter radixConverter)
     private String arrayToString(short[] array)
     {
         StringBuilder sb = new StringBuilder(array.length);
-        for (short el : array)
+        for (int i = 0; i != array.length; i++)
         {
+            short el = array[i];
             sb.append(el).append(", ");
         }
         String str = sb.toString();

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

@@ -37,8 +37,9 @@ public void testKEM()
         };
 
         TestSampler sampler = new TestSampler();
-        for (SNTRUPrimeParameters paramSpec : paramList)
+        for (int i = 0; i != paramList.length; i++)
         {
+            SNTRUPrimeParameters paramSpec = paramList[i];
             System.out.println("****    Parameter Spec - '" + paramSpec.getName().toUpperCase() + "'    ****");
             InputStream resource = SNTRUPrimeTest.class.getResourceAsStream(resourcePath + paramSpec.getName().toLowerCase() + ".rsp");
             BufferedReader resourceReader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(resource)));