Java 4 compat changes

Author: dghgit

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

@@ -502,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();
@@ -541,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
             {
@@ -550,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();
@@ -565,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
             {
@@ -575,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();
@@ -591,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
             {
@@ -602,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();
@@ -618,16 +612,14 @@ private void rejectionUpStreamTest(MLDSAParameters parameters, String filename)
     {
         rejectionTest(parameters, filename, new RejectionOperation()
         {
-            @Override
             public byte[] processSign(MLDSAPrivateKeyParameters privParams, byte[] msg)
                 throws CryptoException
             {
                 InternalMLDSASigner signer = new InternalMLDSASigner();
                 signer.init(true, privParams);
                 return signer.internalGenerateSignature(msg, new byte[32]);
             }
-
-            @Override
+            
             public boolean processVerify(MLDSAPublicKeyParameters pubParams, byte[] msg, byte[] sig)
             {
                 InternalMLDSASigner signer = new InternalMLDSASigner();
@@ -661,7 +653,7 @@ private static List<TestVector> parseTestVectors(InputStream src)
             }
 
             // Look for test vector array start
-            if (line.contains("dilithium_rejection_testvectors[] = "))
+            if (line.indexOf("dilithium_rejection_testvectors[] = ") >= 0)
             {
                 continue;
             }
@@ -689,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;
@@ -718,7 +710,7 @@ 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();
         }
 
         if ("seed".equals(field))

pg/src/main/java/org/bouncycastle/bcpg/ArmoredInputStream.java

@@ -218,7 +218,7 @@ private void rejectUnknownHeadersInCSFMessages()
         throws ArmoredInputException
     {
         Iterator<String> headerLines = headerList.iterator();
-        String header = headerLines.next();
+        String header = (String)headerLines.next();
 
         // Only reject unknown headers in cleartext signed messages
         if (!header.startsWith("-----BEGIN PGP SIGNED MESSAGE-----"))
@@ -229,7 +229,7 @@ private void rejectUnknownHeadersInCSFMessages()
         outerloop:
         while (headerLines.hasNext())
         {
-            String headerLine = headerLines.next();
+            String headerLine = (String)headerLines.next();
             for (Iterator it = allowedHeaders.iterator(); it.hasNext(); )
             {
                 if (headerLine.startsWith((String)it.next() + ": "))