Merge branch 'main' into 1809-pgp-librepgp-ocbencrypteddata

# Conflicts:
#	pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyEncSessionPacket.java
#	pg/src/test/java/org/bouncycastle/openpgp/test/RegressionTest.java

Author: gefeili

.github/workflows/codeql.yml

@@ -67,8 +67,8 @@ jobs:
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |
-         echo "Run, Build Application using script"
-         gradle clean build
+    #     echo "Run, Build Application using script"
+    #     gradle clean build
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

CONTRIBUTORS.html

@@ -550,6 +550,7 @@
 <li>Karsten Otto &lt;https://github.com/ottoka&gt; - finished the support for jdk.tls.server.defaultDHEParameters.</li>
 <li>Markus Sommer &lt;https://github.com/marsom&gt; - BCStyle lookup table fix for jurisdiction values.</li>
 <li>TaZbon &lt;https://github.com/TaZbon&gt; - Optional lax parsing patch for PEM parser.</li>
+<li>han-ji &lt;https://github.com/han-jl&gt; - Fix to sign extension issue in CTR random seek code.</li>
 </ul>
 </body>
 </html>

core/build.gradle

@@ -8,6 +8,7 @@ application {
     mainClass.set("org.bouncycastle.crypto.fpe.SP80038GMicroBenchmark")
 }
 
+jar.archiveBaseName = "bccore-$vmrange"
 
 test {
     forkEvery = 1;

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

@@ -22,7 +22,7 @@ static PolyVecK unpackPublicKey(PolyVecK t1, byte[] publicKey, DilithiumEngine e
 
         for (i = 0; i < engine.getDilithiumK(); ++i)
         {
-            t1.getVectorIndex(i).polyt1Unpack(Arrays.copyOfRange(publicKey, i * DilithiumEngine.DilithiumPolyT1PackedBytes, DilithiumEngine.SeedBytes + (i + 1) * DilithiumEngine.DilithiumPolyT1PackedBytes));
+            t1.getVectorIndex(i).polyt1Unpack(Arrays.copyOfRange(publicKey, i * DilithiumEngine.DilithiumPolyT1PackedBytes, (i + 1) * DilithiumEngine.DilithiumPolyT1PackedBytes));
         }
         return t1;
     }

core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSAEngine.java

@@ -237,7 +237,7 @@ else if (this.DilithiumGamma1 == (1 << 19))
     }
 
     //Internal functions are deterministic. No randomness is sampled inside them
-    public byte[][] generateKeyPairInternal(byte[] seed)
+    private byte[][] generateKeyPairInternal(byte[] seed)
     {
         byte[] buf = new byte[2 * SeedBytes + CrhBytes];
         byte[] tr = new byte[TrBytes];

core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSAKeyPairGenerator.java

@@ -10,47 +10,19 @@ public class MLDSAKeyPairGenerator
     implements AsymmetricCipherKeyPairGenerator
 {
     private MLDSAParameters dilithiumParams;
-
     private SecureRandom random;
 
-    private void initialize(
-        KeyGenerationParameters param)
+    public void init(KeyGenerationParameters param)
     {
         this.dilithiumParams = ((MLDSAKeyGenerationParameters)param).getParameters();
         this.random = param.getRandom();
     }
 
-    private AsymmetricCipherKeyPair genKeyPair()
-    {
-        MLDSAEngine engine = dilithiumParams.getEngine(random);
-
-        byte[][] keyPair = engine.generateKeyPair();
-        // System.out.println("pk gen = ");
-        // Helper.printByteArray(keyPair[0]);
-
-        MLDSAPublicKeyParameters pubKey = new MLDSAPublicKeyParameters(dilithiumParams, keyPair[0], keyPair[6]);
-        MLDSAPrivateKeyParameters privKey = new MLDSAPrivateKeyParameters(dilithiumParams, keyPair[0], keyPair[1], keyPair[2], keyPair[3], keyPair[4], keyPair[5], keyPair[6]);
-
-        return new AsymmetricCipherKeyPair(pubKey, privKey);
-    }
-
-    public void init(KeyGenerationParameters param)
-    {
-        this.initialize(param);
-    }
-
     public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        return genKeyPair();
-    }
-    public AsymmetricCipherKeyPair internalGenerateKeyPair(byte[] seed)
     {
         MLDSAEngine engine = dilithiumParams.getEngine(random);
 
-        byte[][] keyPair = engine.generateKeyPairInternal(seed);
-        // System.out.println("pk gen = ");
-        // Helper.printByteArray(keyPair[0]);
-
+        byte[][] keyPair = engine.generateKeyPair();
         MLDSAPublicKeyParameters pubKey = new MLDSAPublicKeyParameters(dilithiumParams, keyPair[0], keyPair[6]);
         MLDSAPrivateKeyParameters privKey = new MLDSAPrivateKeyParameters(dilithiumParams, keyPair[0], keyPair[1], keyPair[2], keyPair[3], keyPair[4], keyPair[5], keyPair[6]);
 

core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/Packing.java

@@ -22,7 +22,7 @@ static PolyVecK unpackPublicKey(PolyVecK t1, byte[] publicKey, MLDSAEngine engin
 
         for (i = 0; i < engine.getDilithiumK(); ++i)
         {
-            t1.getVectorIndex(i).polyt1Unpack(Arrays.copyOfRange(publicKey, i * MLDSAEngine.DilithiumPolyT1PackedBytes, MLDSAEngine.SeedBytes + (i + 1) * MLDSAEngine.DilithiumPolyT1PackedBytes));
+            t1.getVectorIndex(i).polyt1Unpack(Arrays.copyOfRange(publicKey, i * MLDSAEngine.DilithiumPolyT1PackedBytes, (i + 1) * MLDSAEngine.DilithiumPolyT1PackedBytes));
         }
         return t1;
     }

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

@@ -39,6 +39,7 @@ public static Test suite()
         suite.addTestSuite(FalconTest.class);
         suite.addTestSuite(MLKEMTest.class);
         suite.addTestSuite(CrystalsDilithiumTest.class);
+        suite.addTestSuite(MLDSATest.class);
         suite.addTestSuite(NTRULPRimeTest.class);
         suite.addTestSuite(SNTRUPrimeTest.class);
         suite.addTestSuite(BIKETest.class);
@@ -47,6 +48,7 @@ public static Test suite()
         suite.addTestSuite(GeMSSTest.class);
         suite.addTestSuite(XWingTest.class);
         suite.addTestSuite(AllTests.SimpleTestTest.class);
+        suite.addTestSuite(SLHDSATest.class);
 
         return new BCTestSetup(suite);
     }