Merge branch 'main' into sm2-key-exchange

Author: gefeili

core/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410NamedParameters.java

@@ -15,7 +15,7 @@ public class GOST3410NamedParameters
     static final Hashtable params = new Hashtable();
     static final Hashtable names = new Hashtable();
 
-    static private GOST3410ParamSetParameters cryptoProA = new GOST3410ParamSetParameters(
+    private static final GOST3410ParamSetParameters cryptoProA = new GOST3410ParamSetParameters(
             1024,
             new BigInteger("127021248288932417465907042777176443525787653508916535812817507265705031260985098497423188333483401180925999995120988934130659205614996724254121049274349357074920312769561451689224110579311248812610229678534638401693520013288995000362260684222750813532307004517341633685004541062586971416883686778842537820383"),
             new BigInteger("68363196144955700784444165611827252895102170888761442055095051287550314083023"),
@@ -32,7 +32,7 @@ public class GOST3410NamedParameters
 
            );
 
-    static private GOST3410ParamSetParameters cryptoProB = new GOST3410ParamSetParameters(
+    private static final GOST3410ParamSetParameters cryptoProB = new GOST3410ParamSetParameters(
             1024,
             new BigInteger("139454871199115825601409655107690713107041707059928031797758001454375765357722984094124368522288239833039114681648076688236921220737322672160740747771700911134550432053804647694904686120113087816240740184800477047157336662926249423571248823968542221753660143391485680840520336859458494803187341288580489525163"),
             new BigInteger("79885141663410976897627118935756323747307951916507639758300472692338873533959"),
@@ -53,7 +53,7 @@ public class GOST3410NamedParameters
 //}
          );
 
-    static private GOST3410ParamSetParameters cryptoProXchA = new GOST3410ParamSetParameters(
+    private static final GOST3410ParamSetParameters cryptoProXchA = new GOST3410ParamSetParameters(
     1024,
     new BigInteger("142011741597563481196368286022318089743276138395243738762872573441927459393512718973631166078467600360848946623567625795282774719212241929071046134208380636394084512691828894000571524625445295769349356752728956831541775441763139384457191755096847107846595662547942312293338483924514339614727760681880609734239"),
     new BigInteger("91771529896554605945588149018382750217296858393520724172743325725474374979801"),

core/src/main/java/org/bouncycastle/crypto/params/DESParameters.java

@@ -1,5 +1,7 @@
 package org.bouncycastle.crypto.params;
 
+import org.bouncycastle.util.Arrays;
+
 public class DESParameters
     extends KeyParameter
 {
@@ -17,14 +19,14 @@ public DESParameters(
     /*
      * DES Key length in bytes.
      */
-    static public final int DES_KEY_LENGTH = 8;
+    public static final int DES_KEY_LENGTH = 8;
 
     /*
      * Table of weak and semi-weak keys taken from Schneier pp281
      */
-    static private final int N_DES_WEAK_KEYS = 16;
+    private static final int N_DES_WEAK_KEYS = 16;
 
-    static private byte[] DES_weak_keys =
+    private static byte[] DES_weak_keys =
     {
         /* weak keys */
         (byte)0x01,(byte)0x01,(byte)0x01,(byte)0x01, (byte)0x01,(byte)0x01,(byte)0x01,(byte)0x01,
@@ -58,27 +60,21 @@ public DESParameters(
      * @return true if the given DES key material is weak or semi-weak,
      *     false otherwise.
      */
-    public static boolean isWeakKey(
-        byte[] key,
-        int offset)
+    public static boolean isWeakKey(byte[] key, int offset)
     {
-        if (key.length - offset < DES_KEY_LENGTH)
+        if (offset > (key.length - DES_KEY_LENGTH))
         {
             throw new IllegalArgumentException("key material too short.");
         }
 
-        nextkey: for (int i = 0; i < N_DES_WEAK_KEYS; i++)
+        for (int i = 0; i < N_DES_WEAK_KEYS; i++)
         {
-            for (int j = 0; j < DES_KEY_LENGTH; j++)
+            if (Arrays.constantTimeAreEqual(DES_KEY_LENGTH, key, offset, DES_weak_keys, i * DES_KEY_LENGTH))
             {
-                if (key[j + offset] != DES_weak_keys[i * DES_KEY_LENGTH + j])
-                {
-                    continue nextkey;
-                }
+                return true;
             }
-
-            return true;
         }
+
         return false;
     }
 

core/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java

@@ -6,7 +6,7 @@ public class DESedeParameters
     /*
      * DES-EDE Key length in bytes.
      */
-    static public final int DES_EDE_KEY_LENGTH = 24;
+    public static final int DES_EDE_KEY_LENGTH = 24;
 
     public DESedeParameters(
         byte[]  key)

core/src/main/java/org/bouncycastle/pqc/crypto/cmce/CMCEEngine.java

@@ -1049,7 +1049,7 @@ private static int ctz(long in)
     }
 
     /* Used in mov columns*/
-    static private long same_mask64(short x, short y)
+    private static long same_mask64(short x, short y)
     {
         long mask;
 

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

@@ -21,6 +21,10 @@ public MLKEMExtractor(MLKEMPrivateKeyParameters privateKey)
 
     public byte[] extractSecret(byte[] encapsulation)
     {
+        if (encapsulation.length != this.getEncapsulationLength())
+        {
+            throw new IllegalArgumentException("encapsulation wrong length");
+        }
         return engine.kemDecrypt(privateKey, encapsulation);
     }
 

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

@@ -112,7 +112,13 @@ private void validate()
         }
     }
 
+    /** @deprecated Use {@link #withPreferredFormat(int)} instead. */
     public MLKEMPrivateKeyParameters getParametersWithFormat(int format)
+    {
+        return withPreferredFormat(format); 
+    }
+
+    public MLKEMPrivateKeyParameters withPreferredFormat(int format)
     {
         if (this.prefFormat == format)
         {

core/src/main/java/org/bouncycastle/util/Strings.java

@@ -333,7 +333,7 @@ public static String[] split(String input, char delimiter)
         while (moreTokens)
         {
             int tokenLocation = input.indexOf(delimiter);
-            if (tokenLocation > 0)
+            if (tokenLocation >= 0)
             {
                 subString = input.substring(0, tokenLocation);
                 v.addElement(subString);

core/src/main/jdk1.1/java/security/SecurityUtil.java

@@ -33,7 +33,7 @@ Provider getProvider()
      *
      * @return null if no algorithm found, an Implementation if it is.
      */
-    static private Implementation getImplementation(
+    private static Implementation getImplementation(
         String      baseName,
         String      algorithm,
         Provider    prov)

core/src/main/jdk1.1/org/bouncycastle/pqc/crypto/util/PrivateKeyFactory.java

@@ -157,10 +157,10 @@ else if (algOID.equals(NISTObjectIdentifiers.id_alg_ml_kem_512) ||
             algOID.equals(NISTObjectIdentifiers.id_alg_ml_kem_768) ||
             algOID.equals(NISTObjectIdentifiers.id_alg_ml_kem_1024))
         {
-            ASN1OctetString kyberKey = ASN1OctetString.getInstance(keyInfo.parsePrivateKey());
-            MLKEMParameters kyberParams = Utils.mlkemParamsLookup(algOID);
+            ASN1OctetString mlkemKey = ASN1OctetString.getInstance(keyInfo.parsePrivateKey());
+            MLKEMParameters mlkemParams = Utils.mlkemParamsLookup(algOID);
 
-            return new MLKEMPrivateKeyParameters(kyberParams, kyberKey.getOctets());
+            return new MLKEMPrivateKeyParameters(mlkemParams, mlkemKey.getOctets());
         }
         else if (Utils.mldsaParams.containsKey(algOID))
         {

core/src/main/jdk1.1/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java

@@ -108,12 +108,12 @@ public class PublicKeyFactory
         converters.put(BCObjectIdentifiers.picnicl5full, new PicnicConverter());
         converters.put(BCObjectIdentifiers.falcon_512, new FalconConverter());
         converters.put(BCObjectIdentifiers.falcon_1024, new FalconConverter());
-        converters.put(NISTObjectIdentifiers.id_alg_ml_kem_512, new KyberConverter());
-        converters.put(NISTObjectIdentifiers.id_alg_ml_kem_768, new KyberConverter());
-        converters.put(NISTObjectIdentifiers.id_alg_ml_kem_1024, new KyberConverter());
-        converters.put(BCObjectIdentifiers.kyber512_aes, new KyberConverter());
-        converters.put(BCObjectIdentifiers.kyber768_aes, new KyberConverter());
-        converters.put(BCObjectIdentifiers.kyber1024_aes, new KyberConverter());
+        converters.put(NISTObjectIdentifiers.id_alg_ml_kem_512, new MLKEMConverter());
+        converters.put(NISTObjectIdentifiers.id_alg_ml_kem_768, new MLKEMConverter());
+        converters.put(NISTObjectIdentifiers.id_alg_ml_kem_1024, new MLKEMConverter());
+        converters.put(BCObjectIdentifiers.kyber512_aes, new MLKEMConverter());
+        converters.put(BCObjectIdentifiers.kyber768_aes, new MLKEMConverter());
+        converters.put(BCObjectIdentifiers.kyber1024_aes, new MLKEMConverter());
         converters.put(NISTObjectIdentifiers.id_ml_dsa_44, new MLDSAConverter());
         converters.put(NISTObjectIdentifiers.id_ml_dsa_65, new MLDSAConverter());
         converters.put(NISTObjectIdentifiers.id_ml_dsa_87, new MLDSAConverter());
@@ -351,16 +351,16 @@ AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Obje
         }
     }
 
-    private static class KyberConverter
+    private static class MLKEMConverter
         extends SubjectPublicKeyInfoConverter
     {
         AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Object defaultParams)
             throws IOException
         {
-            MLKEMParameters kyberParameters = Utils.mlkemParamsLookup(keyInfo.getAlgorithm().getAlgorithm());
+            MLKEMParameters mlkemParameters = Utils.mlkemParamsLookup(keyInfo.getAlgorithm().getAlgorithm());
 
             // we're a raw encoding
-            return new MLKEMPublicKeyParameters(kyberParameters, keyInfo.getPublicKeyData().getOctets());
+            return new MLKEMPublicKeyParameters(mlkemParameters, keyInfo.getPublicKeyData().getOctets());
         }
     }