minor refactorings, compatibility changes

Author: dghgit

build1-1

@@ -294,6 +294,7 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
     rm -f  org/bouncycastle/jcajce/provider/asymmetric/NTRU.java
     rm -f  org/bouncycastle/jcajce/provider/asymmetric/Falcon.java
     rm -f  org/bouncycastle/test/PrintTestResult.java
+    rm  org/bouncycastle/openpgp/test/PGPAeadTest.java
 
     sh ../../scripts/jdk1.2ed.sh > /dev/null 2>&1
     sh ../../scripts/jdk1.1ed.sh > /dev/null 2>&1
@@ -680,6 +681,7 @@ then
     rm  src/org/bouncycastle/openpgp/test/ArmoredOutputStreamUTF8Test.java
     rm -f src/org/bouncycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java
     rm -f src/org/bouncycastle/openpgp/examples/EllipticCurveKeyPairGenerator.java
+    rm  src/org/bouncycastle/openpgp/test/PGPAeadTest.java
 
     find src -name AllTests.java -exec rm {} \;
 
@@ -732,6 +734,12 @@ q
 g/private.*final.*;/s/final//
 w
 q
+%
+
+    ed src/org/bouncycastle/bcpg/sig/PreferredAEADCiphersuites.java <<%
+g/private.*final.*;/s/final//
+w
+q
 %
 
     ed src/org/bouncycastle/bcpg/ArmoredOutputStream.java <<%

build1-2

@@ -237,6 +237,7 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
     rm -rf org/bouncycastle/tsp/TimeStampTokenInfoUnit*
     rm  org/bouncycastle/openpgp/test/BcPGPEd25519JcaKeyPairConversionTest.java
     rm  org/bouncycastle/openpgp/test/ArmoredOutputStreamUTF8Test.java
+    rm  org/bouncycastle/openpgp/test/PGPAeadTest.java
 
     sh ../../scripts/jdk1.2ed.sh
 

core/src/main/java/org/bouncycastle/pqc/crypto/crystals/dilithium/Symmetric.java

@@ -1,8 +1,8 @@
 package org.bouncycastle.pqc.crypto.crystals.dilithium;
 
+import org.bouncycastle.crypto.StreamCipher;
 import org.bouncycastle.crypto.digests.SHAKEDigest;
 import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.modes.CTRModeCipher;
 import org.bouncycastle.crypto.modes.SICBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -31,7 +31,7 @@ static class AesSymmetric
         extends Symmetric
     {
 
-        private final CTRModeCipher cipher;
+        private final StreamCipher cipher;
 
         AesSymmetric()
         {

core/src/main/java/org/bouncycastle/pqc/crypto/crystals/kyber/Symmetric.java

@@ -1,12 +1,12 @@
 package org.bouncycastle.pqc.crypto.crystals.kyber;
 
 import org.bouncycastle.crypto.ExtendedDigest;
+import org.bouncycastle.crypto.StreamCipher;
 import org.bouncycastle.crypto.digests.SHA256Digest;
 import org.bouncycastle.crypto.digests.SHA3Digest;
 import org.bouncycastle.crypto.digests.SHA512Digest;
 import org.bouncycastle.crypto.digests.SHAKEDigest;
 import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.modes.CTRModeCipher;
 import org.bouncycastle.crypto.modes.SICBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -105,7 +105,7 @@ static class AesSymmetric
     {
         private final SHA256Digest sha256Digest;
         private final SHA512Digest sha512Digest;
-        private final CTRModeCipher cipher;
+        private final StreamCipher cipher;
 
         AesSymmetric()
         {

core/src/main/java/org/bouncycastle/pqc/crypto/saber/Symmetric.java

@@ -1,12 +1,12 @@
 package org.bouncycastle.pqc.crypto.saber;
 
+import org.bouncycastle.crypto.StreamCipher;
 import org.bouncycastle.crypto.Xof;
 import org.bouncycastle.crypto.digests.SHA256Digest;
 import org.bouncycastle.crypto.digests.SHA3Digest;
 import org.bouncycastle.crypto.digests.SHA512Digest;
 import org.bouncycastle.crypto.digests.SHAKEDigest;
 import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.modes.CTRModeCipher;
 import org.bouncycastle.crypto.modes.SICBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -54,18 +54,14 @@ void prf(byte[] out, byte[] in, int inLen, int outLen)
             shakeDigest.update(in, 0, inLen);
             shakeDigest.doFinal(out, 0, outLen);
         }
-
-
     }
+    
     static class AesSymmetric
         extends Symmetric
     {
-
         private final SHA256Digest sha256Digest;
         private final SHA512Digest sha512Digest;
-
-        private final CTRModeCipher cipher;
-
+        private final StreamCipher cipher;
 
         AesSymmetric()
         {