1.1/1.2 compatibility updates

Author: dghgit

build1-1

@@ -105,6 +105,8 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
     rm -rf org/bouncycastle/crypto/CryptoServicesPermission.java
     rm -rf org/bouncycastle/crypto/tls/test
     rm -rf org/bouncycastle/crypto/digests/Blake3Digest.java
+    rm -rf org/bouncycastle/jcajce/provider/digest/Blake3.java
+    rm -rf org/bouncycastle/jcajce/provider/asymmetric/SPHINCSPlus.java
     rm -rf org/bouncycastle/crypto/macs/Blake3Mac.java
     rm -rf org/bouncycastle/crypto/test/Blake3Test.java
     rm -rf org/bouncycastle/crypto/test/SimpleTestTest.java
@@ -122,6 +124,7 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
     rm -rf org/bouncycastle/jcajce/provider/asymmetric/EdEC.java
     rm -rf org/bouncycastle/jcajce/provider/config/ProviderConfigurationPermission.java
     rm -rf org/bouncycastle/jcajce/provider/test
+    rm -rf org/bouncycastle/asn1/misc/test/CMPUpdates16Test.java
     rm org/bouncycastle/jcajce/BCFKSStoreParameter.java
     rm -rf org/bouncycastle/jce/provider/test/ECDSA5Test.java
     rm -rf org/bouncycastle/jce/provider/test/CRL5Test.java
@@ -220,11 +223,15 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
     rm -rf org/bouncycastle/cms/test
     rm org/bouncycastle/cms/jcajce/JceAADStream.java
     rm org/bouncycastle/jcajce/provider/keystore/util/ParameterUtil.java
+    rm -rf org/bouncycastle/pqc/crypto/*/CMCEVectorTest*
+    rm -rf org/bouncycastle/pqc/crypto/*/FrodoVectorTest*
+    rm -rf org/bouncycastle/pqc/crypto/*/SABERVectorTest*
     rm -rf org/bouncycastle/pkix/jcajce/X509*
     rm -rf org/bouncycastle/pkix/jcajce/RFC3280*
     rm -rf org/bouncycastle/pkix/jcajce/Revocation*
     rm -rf org/bouncycastle/pkix/test/Revocation*
     rm -rf org/bouncycastle/pkix/test/TestUtil*
+    rm org/bouncycastle/pkix/test/CheckerTest.java
     rm org/bouncycastle/cms/jcajce/JceKeyTransAuthEnvelopedRecipient.java
     rm -rf org/bouncycastle/mime/
     rm -rf org/bouncycastle/its/
@@ -357,6 +364,7 @@ javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/li
 javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip util/io/*/*.java 
 javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip pqc/math/*/*.java 
 javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip pqc/crypto/*/*.java  pqc/crypto/*/*/*.java
+javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip pqc/crypto/en*/*.java
 javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip */u*/*.java )
 
         cp ../../../../core/src/test/resources/org/bouncycastle/crypto/test/*.txt classes/org/bouncycastle/crypto/test/
@@ -597,6 +605,7 @@ then
     PATH=$JDK11PATH/bin:$PATH
     export PATH
 
+
     rm -rf src/java
     rm -rf src/org/bouncycastle/jce
     rm -rf src/org/bouncycastle/ocsp
@@ -619,6 +628,7 @@ then
     rm -f src/org/bouncycastle/openpgp/test/DSA2Test.java
     rm -f src/org/bouncycastle/openpgp/test/PGPUnicodeTest.java
     rm -f src/org/bouncycastle/openpgp/test/BcPGPEd25519JcaKeyPairConversionTest.java
+    rm  src/org/bouncycastle/openpgp/test/ArmoredOutputStreamUTF8Test.java
     rm -f src/org/bouncycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java
 
     find src -name AllTests.java -exec rm {} \;
@@ -639,6 +649,15 @@ then
     echo "compiling"
 
 
+    for i in src/org/bouncycastle/pqc/jcajce/provider/*/*.java  src/org/bouncycastle/pqc/crypto/*/*.java  src/org/bouncycastle/openpgp/test/*.java
+    do
+ed $i <<%%
+g/.Override/d
+w
+q
+%%
+    done
+
     ed src/org/bouncycastle/gpg/SExpression.java <<%
 g/\.\.\. /s//[]/
 w

build1-2

@@ -78,13 +78,17 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
     rm -rf org/bouncycastle/pqc/crypto/*/HSS*
     rm -rf org/bouncycastle/pqc/crypto/*/EncryptionKey*
     rm -rf org/bouncycastle/pqc/crypto/*/BitStringT*
+    rm -rf org/bouncycastle/pqc/crypto/*/CMCEVectorTest*
+    rm -rf org/bouncycastle/pqc/crypto/*/FrodoVectorTest*
+    rm -rf org/bouncycastle/pqc/crypto/*/SABERVectorTest*
     rm org/bouncycastle/pqc/jcajce/spec/LMS*
     rm -rf org/bouncycastle/crypto/*/test
     rm -rf org/bouncycastle/crypto/*/IndexGenerator*
     rm -rf org/bouncycastle/crypto/test/SimpleTestTest.java
     rm -rf org/bouncycastle/util/utiltest
     rm -rf org/bouncycastle/mail
     rm -rf org/bouncycastle/mime
+    rm org/bouncycastle/pkix/test/CheckerTest.java
     rm org/bouncycastle/pkix/jcajce/Revocation*.java
     rm org/bouncycastle/pkix/jcajce/X509RevocationChecker.java
     rm org/bouncycastle/pkix/jcajce/RFC3280*.java
@@ -184,6 +188,7 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
     rm -rf org/bouncycastle/tsp/GenTimeAccuracyUnit*
     rm -rf org/bouncycastle/tsp/TimeStampTokenInfoUnit*
     rm  org/bouncycastle/openpgp/test/BcPGPEd25519JcaKeyPairConversionTest.java
+    rm  org/bouncycastle/openpgp/test/ArmoredOutputStreamUTF8Test.java
 
     sh ../../scripts/jdk1.2ed.sh
 

core/src/main/jdk1.1/org/bouncycastle/crypto/params/RSAKeyParameters.java

@@ -0,0 +1,113 @@
+package org.bouncycastle.crypto.params;
+
+import java.math.BigInteger;
+
+import org.bouncycastle.crypto.CryptoServicesRegistrar;
+import org.bouncycastle.math.Primes;
+import org.bouncycastle.util.BigIntegers;
+import org.bouncycastle.util.Properties;
+
+public class RSAKeyParameters
+    extends AsymmetricKeyParameter
+{
+    // Hexadecimal value of the product of the 131 smallest odd primes from 3 to 743
+    private static final BigInteger SMALL_PRIMES_PRODUCT = new BigInteger(
+              "8138e8a0fcf3a4e84a771d40fd305d7f4aa59306d7251de54d98af8fe95729a1f"
+            + "73d893fa424cd2edc8636a6c3285e022b0e3866a565ae8108eed8591cd4fe8d2"
+            + "ce86165a978d719ebf647f362d33fca29cd179fb42401cbaf3df0c614056f9c8"
+            + "f3cfd51e474afb6bc6974f78db8aba8e9e517fded658591ab7502bd41849462f",
+        16);
+
+    private static final BigInteger ONE = BigInteger.valueOf(1);
+
+    private BigInteger      modulus;
+    private BigInteger      exponent;
+
+    public RSAKeyParameters(
+        boolean     isPrivate,
+        BigInteger  modulus,
+        BigInteger  exponent)
+    {
+        this(isPrivate, modulus, exponent, false);
+    }   
+
+    public RSAKeyParameters(
+        boolean     isPrivate,
+        BigInteger  modulus,
+        BigInteger  exponent,
+        boolean     isInternal)
+    {
+        super(isPrivate);
+
+        if (!isPrivate)
+        {
+            if ((exponent.intValue() & 1) == 0)
+            {
+                throw new IllegalArgumentException("RSA publicExponent is even");
+            }
+        }
+  
+        // only check public keys
+        this.modulus = isPrivate ? modulus : validate(modulus, isInternal);
+        this.exponent = exponent;
+    }
+
+    private BigInteger validate(BigInteger modulus, boolean isInternal)
+    {
+        if (isInternal)
+        {
+            return modulus;
+        }
+
+        if ((modulus.intValue() & 1) == 0)
+        {
+            throw new IllegalArgumentException("RSA modulus is even");
+        }
+
+        // If you need to set this you need to have a serious word to whoever is generating
+        // your keys.
+        if (Properties.isOverrideSet("org.bouncycastle.rsa.allow_unsafe_mod"))
+        {
+            return modulus;
+        }
+
+        int maxBitLength = Properties.asInteger("org.bouncycastle.rsa.max_size", 15360);
+
+        int modBitLength = modulus.bitLength();
+        if (maxBitLength < modBitLength)
+        {
+            throw new IllegalArgumentException("modulus value out of range");
+        }
+
+        if (!modulus.gcd(SMALL_PRIMES_PRODUCT).equals(ONE))
+        {
+            throw new IllegalArgumentException("RSA modulus has a small prime factor");
+        }
+
+        int bits = modulus.bitLength() / 2;
+        int iterations = bits >= 1536 ? 3
+            : bits >= 1024 ? 4
+            : bits >= 512 ? 7
+            : 50;
+
+        Primes.MROutput mr = Primes.enhancedMRProbablePrimeTest(modulus, CryptoServicesRegistrar.getSecureRandom(), iterations);
+        if (!mr.isProvablyComposite())
+        {
+            throw new IllegalArgumentException("RSA modulus is not composite");
+        }
+
+        //validated.add(modulus);
+        
+        return modulus;
+    }
+
+    public BigInteger getModulus()
+    {
+        return modulus;
+    }
+
+    public BigInteger getExponent()
+    {
+        return exponent;
+    }
+}