moved pubKey test for ML-DSA to apply to both encodings.

added pubKey check to ML-KEM where pubKey is provided.

Author: dghgit

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

@@ -82,17 +82,17 @@ public MLDSAPrivateKeyParameters(MLDSAParameters params, byte[] encoding, MLDSAP
             this.t0 = Arrays.copyOfRange(encoding, index, index + delta);
             index += delta;
             this.t1 = eng.deriveT1(rho, k, tr, s1, s2, t0);
+            this.seed = null;
+        }
 
-            if (pubKey != null)
+        if (pubKey != null)
+        {
+            if (!Arrays.constantTimeAreEqual(this.t1, pubKey.getT1()))
             {
-                if (!Arrays.constantTimeAreEqual(this.t1, pubKey.getT1()))
-                {
-                    throw new IllegalArgumentException("passed in public key does not match private values");
-                }
+                throw new IllegalArgumentException("passed in public key does not match private values");
             }
-
-            this.seed = null;
         }
+
         this.prefFormat = (seed != null) ? BOTH : EXPANDED_KEY;
     }
 

core/src/main/java/org/bouncycastle/pqc/crypto/mlkem/MLKEMPrivateKeyParameters.java

@@ -37,6 +37,11 @@ public MLKEMPrivateKeyParameters(MLKEMParameters params, byte[] s, byte[] hpk, b
     }
 
     public MLKEMPrivateKeyParameters(MLKEMParameters params, byte[] encoding)
+    {
+        this(params, encoding, null);
+    }
+
+    public MLKEMPrivateKeyParameters(MLKEMParameters params, byte[] encoding, MLKEMPublicKeyParameters pubKey)
     {
         super(true, params);
 
@@ -68,6 +73,14 @@ public MLKEMPrivateKeyParameters(MLKEMParameters params, byte[] encoding)
             this.seed = null;
         }
 
+        if (pubKey != null)
+        {
+            if (!Arrays.constantTimeAreEqual(this.t, pubKey.t) || !Arrays.constantTimeAreEqual(this.rho, pubKey.rho))
+            {
+                throw new IllegalArgumentException("passed in public key does not match private values");
+            }
+        }
+
         this.prefFormat = BOTH;
     }