reverted introduction of switch and diamond operators.

Author: dghgit

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

@@ -45,13 +45,14 @@ public class MLDSATest
     };
 
     private static final MLDSAParameters[] PARAMETER_SETS = new MLDSAParameters[]
-    {
-        MLDSAParameters.ml_dsa_44,
-        MLDSAParameters.ml_dsa_65,
-        MLDSAParameters.ml_dsa_87,
-    };
+        {
+            MLDSAParameters.ml_dsa_44,
+            MLDSAParameters.ml_dsa_65,
+            MLDSAParameters.ml_dsa_87,
+        };
 
-    public void testConsistency() throws Exception
+    public void testConsistency()
+        throws Exception
     {
         SecureRandom random = new SecureRandom();
 
@@ -501,7 +502,7 @@ private void rejectionTest(MLDSAParameters parameters, String filename, Rejectio
         List<TestVector> testVectors = parseTestVectors(TestResourceFinder.findTestResource("pqc/crypto/mldsa", filename));
         for (int i = 0; i < testVectors.size(); ++i)
         {
-            TestVector t = testVectors.get(i);
+            TestVector t = (TestVector)testVectors.get(i);
             FixedSecureRandom random = new FixedSecureRandom(t.seed);
 
             MLDSAKeyPairGenerator kpGen = new MLDSAKeyPairGenerator();
@@ -540,7 +541,6 @@ private void rejectionExternalMuTest(MLDSAParameters parameters, String filename
     {
         rejectionTest(parameters, filename, new RejectionOperation()
         {
-            @Override
             public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 throws CryptoException
             {
@@ -549,7 +549,6 @@ public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 return signer.generateMuSignature(msg);
             }
 
-            @Override
             public boolean processVerify(MLDSAPublicKeyParameters pubParams, byte[] msg, byte[] sig)
             {
                 InternalMLDSASigner signer = new InternalMLDSASigner();
@@ -564,7 +563,6 @@ private void rejectionPrehashTest(MLDSAParameters parameters, String filename)
     {
         rejectionTest(parameters, filename, new RejectionOperation()
         {
-            @Override
             public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 throws CryptoException
             {
@@ -574,7 +572,6 @@ public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 return signer.generateSignature();
             }
 
-            @Override
             public boolean processVerify(MLDSAPublicKeyParameters pubParams, byte[] msg, byte[] sig)
             {
                 HashMLDSASigner signer = new HashMLDSASigner();
@@ -590,7 +587,6 @@ private void rejectionTest(MLDSAParameters parameters, String filename)
     {
         rejectionTest(parameters, filename, new RejectionOperation()
         {
-            @Override
             public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 throws CryptoException
             {
@@ -601,7 +597,6 @@ public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 return signer.generateSignature();
             }
 
-            @Override
             public boolean processVerify(MLDSAPublicKeyParameters pubParams, byte[] msg, byte[] sig)
             {
                 InternalMLDSASigner signer = new InternalMLDSASigner();
@@ -617,7 +612,6 @@ private void rejectionUpStreamTest(MLDSAParameters parameters, String filename)
     {
         rejectionTest(parameters, filename, new RejectionOperation()
         {
-            @Override
             public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 throws CryptoException
             {
@@ -626,7 +620,6 @@ public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 return signer.internalGenerateSignature(msg, new byte[32]);
             }
 
-            @Override
             public boolean processVerify(MLDSAPublicKeyParameters pubParams, byte[] msg, byte[] sig)
             {
                 InternalMLDSASigner signer = new InternalMLDSASigner();
@@ -640,7 +633,7 @@ public boolean processVerify(MLDSAPublicKeyParameters pubParams, byte[] msg, byt
     private static List<TestVector> parseTestVectors(InputStream src)
         throws IOException
     {
-        List<TestVector> vectors = new ArrayList<>();
+        List<TestVector> vectors = new ArrayList<TestVector>();
         BufferedReader bin = new BufferedReader(new InputStreamReader(src));
 
         TestVector currentVector = null;
@@ -654,13 +647,13 @@ private static List<TestVector> parseTestVectors(InputStream src)
         {
             // Skip comments and empty lines
             line = line.split("//")[0].trim();
-            if (line.isEmpty())
+            if (line.length() == 0)
             {
                 continue;
             }
 
             // Look for test vector array start
-            if (line.contains("dilithium_rejection_testvectors[] = "))
+            if (line.indexOf("dilithium_rejection_testvectors[] = ") >= 0)
             {
                 continue;
             }
@@ -677,7 +670,7 @@ private static List<TestVector> parseTestVectors(InputStream src)
             if (fieldMatcher.find())
             {
                 currentField = fieldMatcher.group(1);
-                currentBytes = new ArrayList<>();
+                currentBytes = new ArrayList<Byte>();
                 line = line.substring(fieldMatcher.end()).trim();
             }
 
@@ -688,11 +681,11 @@ private static List<TestVector> parseTestVectors(InputStream src)
                 while (hexMatcher.find())
                 {
                     String hex = hexMatcher.group(1);
-                    currentBytes.add((byte)Integer.parseInt(hex, 16));
+                    currentBytes.add(new Byte((byte)Integer.parseInt(hex, 16)));
                 }
 
                 // Check for field end
-                if (line.contains("},"))
+                if (line.indexOf("},") >= 0)
                 {
                     setField(currentVector, currentField, currentBytes);
                     currentField = null;
@@ -717,27 +710,30 @@ private static void setField(TestVector vector, String field, List<Byte> bytes)
         byte[] byteArray = new byte[bytes.size()];
         for (int i = 0; i < bytes.size(); i++)
         {
-            byteArray[i] = bytes.get(i);
+            byteArray[i] = ((Byte)bytes.get(i)).byteValue();
         }
 
-        switch (field)
+        if ("seed".equals(field))
         {
-        case "seed":
             vector.seed = byteArray;
-            break;
-        case "pk":
+        }
+        else if ("pk".equals(field))
+        {
             vector.pk = byteArray;
-            break;
-        case "sk":
+        }
+        else if ("sk".equals(field))
+        {
             vector.sk = byteArray;
-            break;
-        case "msg":
+        }
+        else if ("msg".equals(field))
+        {
             vector.msg = byteArray;
-            break;
-        case "sig":
+        }
+        else if ("sig".equals(field))
+        {
             vector.sig = byteArray;
-            break;
         }
+        // else ignore
     }
 
     static class TestVector