cleanup/compatibility changes

Author: dghgit

ant/jdk14.xml

@@ -92,7 +92,7 @@
                 <exclude name="**/legacy/**/NTRU*.java"/>
                 <exclude name="**/xmss/**/*.java"/>
                 <exclude name="**/lms/**/*.java"/>
-                <exclude name="**/pqc/**/EncryptionKeyTest.java"/>
+                <exclude name="**/pqc/legacy/**/*.java"/>
                 <exclude name="**/pqc/**/BitStringTest.java"/>
                 <exclude name="**/pqc/**/XMS*.java"/>
                 <exclude name="**/pqc/**/LMS*.java"/>

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

@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Objects;
 
 import junit.framework.TestCase;
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
@@ -43,7 +42,7 @@ public void testKEM()
             NTRULPRimeParameters paramSpec = paramList[i];
             System.out.println("****    Parameter Spec - '" + paramSpec.getName().toUpperCase() + "'    ****");
             InputStream resource = NTRULPRimeTest.class.getResourceAsStream(resourcePath + paramSpec.getName().toLowerCase() + ".rsp");
-            BufferedReader resourceReader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(resource)));
+            BufferedReader resourceReader = new BufferedReader(new InputStreamReader(resource));
 
             String line;
             while ((line = resourceReader.readLine()) != null)

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

@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Objects;
 
 import junit.framework.TestCase;
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
@@ -42,7 +41,7 @@ public void testKEM()
             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)));
+            BufferedReader resourceReader = new BufferedReader(new InputStreamReader(resource));
 
             String line;
             while ((line = resourceReader.readLine()) != null)