Reverted to gradle 9.1.0, added HKDF to prov

royb · royb · commit 63fc71c54944 · 2025-11-06T11:30:47.000-05:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HKDF.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HKDF.java
@@ -0,0 +1,106 @@
+package org.bouncycastle.jcajce.provider.symmetric;
+
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.DerivationFunction;
+import org.bouncycastle.crypto.Digest;
+import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.bouncycastle.crypto.digests.SHA384Digest;
+import org.bouncycastle.crypto.digests.SHA512Digest;
+import org.bouncycastle.crypto.generators.HKDFBytesGenerator;
+import org.bouncycastle.crypto.params.HKDFParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.internal.asn1.misc.MiscObjectIdentifiers;
+import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
+import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
+import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactorySpi;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+
+public class HKDF extends SecretKeyFactorySpi
+{
+    protected String algName;
+    protected HKDFBytesGenerator hkdf;
+
+
+    private HKDF(String algName, Digest digest)
+    {
+        this.algName = algName;
+        this.hkdf = new HKDFBytesGenerator(digest);
+    }
+
+    @Override
+    protected SecretKey engineGenerateSecret(KeySpec keySpec) throws InvalidKeySpecException
+    {
+        HKDFParameters hkdfParameters = (HKDFParameters) keySpec;
+        int derivedDataLength = hkdfParameters.getIKM().length;
+        hkdf.init(hkdfParameters);
+
+        byte[] derivedData = new byte[derivedDataLength];
+        hkdf.generateBytes(derivedData, 0, derivedDataLength);
+
+        CipherParameters param = new KeyParameter(derivedData);
+
+        return new BCPBEKey(this.algName, param) ;
+    }
+
+
+    @Override
+    protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpec) throws InvalidKeySpecException
+    {
+        return null;
+    }
+
+    @Override
+    protected SecretKey engineTranslateKey(SecretKey key) throws InvalidKeyException
+    {
+        return null;
+    }
+
+
+    public static class Mappings
+            extends AlgorithmProvider
+    {
+        private static final String PREFIX = SCRYPT.class.getName();
+
+        public Mappings()
+        {
+        }
+
+        public void configure(ConfigurableProvider provider)
+        {
+            provider.addAlgorithm("SecretKeyFactory.HKDF", PREFIX + "HKDF");
+            provider.addAlgorithm("SecretKeyFactory.HKDF-SHA256", PREFIX + "$HKDFwithSHA256");
+            provider.addAlgorithm("SecretKeyFactory.HKDF-SHA384", PREFIX + "$HKDFwithSHA384");
+            provider.addAlgorithm("SecretKeyFactory.HKDF-SHA512", PREFIX + "$HKDFwithSHA512");
+
+        }
+    }
+    public static class HKDFwithSHA256 extends HKDF
+    {
+        public HKDFwithSHA256() throws InvalidAlgorithmParameterException
+        {
+            super("HKDF-SHA256", new SHA256Digest());
+        }
+    }
+    public static class HKDFwithSHA384 extends HKDF
+    {
+        public HKDFwithSHA384() throws InvalidAlgorithmParameterException
+        {
+            super("HKDF-SHA384", new SHA384Digest());
+        }
+    }
+    public static class HKDFwithSHA512 extends HKDF
+    {
+
+        public HKDFwithSHA512() throws InvalidAlgorithmParameterException
+        {
+            super("HKDF-SHA512", new SHA512Digest());
+        }
+    }
+    
+}
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/HKDF.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/HKDF.java
@@ -4,7 +4,7 @@
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 
-public class HKDF
+class HKDF
 {
     private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".hkdf.";
 
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java
@@ -4,7 +4,7 @@
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 
-public class PBEPBKDF2
+class PBEPBKDF2
 {
     private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".pbepbkdf2.";
 
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/SCRYPT.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/SCRYPT.java
@@ -3,7 +3,7 @@
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 
-public class SCRYPT
+class SCRYPT
 {
     private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".scrypt.";
 
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/hkdf/HKDFSpi.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/hkdf/HKDFSpi.java
@@ -15,7 +15,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
 
-public class HKDFSpi
+class HKDFSpi
         extends KDFSpi
 {
     protected HKDFBytesGenerator hkdf;
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/pbepbkdf2/PBEPBKDF2Spi.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/pbepbkdf2/PBEPBKDF2Spi.java
@@ -24,7 +24,7 @@
 
 import static org.bouncycastle.crypto.PBEParametersGenerator.PKCS5PasswordToUTF8Bytes;
 
-public class PBEPBKDF2Spi
+class PBEPBKDF2Spi
     extends KDFSpi
 {
 
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/scrypt/SCryptSpi.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/symmetric/scrypt/SCryptSpi.java
@@ -17,7 +17,7 @@
 /**
  * Example KDFSpi that delegates to Bouncy Castle’s SCrypt implementation.
  */
-public class SCryptSpi
+class SCryptSpi
         extends KDFSpi
 {
     protected SCryptSpi(KDFParameters kdfParameters)
diff --git a/prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/MLDSATest.java b/prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/MLDSATest.java
@@ -97,17 +97,17 @@ public void testKeyFactory()
         throws Exception
     {
         KeyFactory kFact = KeyFactory.getInstance("ML-DSA", "BC");
-        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44");
+        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44", "BC");
         KeyPair kp44 = kpGen44.generateKeyPair();
-        KeyPairGenerator kpGen65 = KeyPairGenerator.getInstance("ML-DSA-65");
+        KeyPairGenerator kpGen65 = KeyPairGenerator.getInstance("ML-DSA-65", "BC");
         KeyPair kp65 = kpGen65.generateKeyPair();
-        KeyPairGenerator kpGen87 = KeyPairGenerator.getInstance("ML-DSA-87");
+        KeyPairGenerator kpGen87 = KeyPairGenerator.getInstance("ML-DSA-87", "BC");
         KeyPair kp87 = kpGen87.generateKeyPair();
-        KeyPairGenerator kpGen44withSha512 = KeyPairGenerator.getInstance("ML-DSA-44-WITH-SHA512");
+        KeyPairGenerator kpGen44withSha512 = KeyPairGenerator.getInstance("ML-DSA-44-WITH-SHA512", "BC");
         KeyPair kp44withSha512 = kpGen44withSha512.generateKeyPair();
-        KeyPairGenerator kpGen65withSha512 = KeyPairGenerator.getInstance("ML-DSA-65-WITH-SHA512");
+        KeyPairGenerator kpGen65withSha512 = KeyPairGenerator.getInstance("ML-DSA-65-WITH-SHA512", "BC");
         KeyPair kp65withSha512 = kpGen65withSha512.generateKeyPair();
-        KeyPairGenerator kpGen87withSha512 = KeyPairGenerator.getInstance("ML-DSA-87-WITH-SHA512");
+        KeyPairGenerator kpGen87withSha512 = KeyPairGenerator.getInstance("ML-DSA-87-WITH-SHA512", "BC");
         KeyPair kp87withSha512 = kpGen87withSha512.generateKeyPair();
 
         tryKeyFact(KeyFactory.getInstance("ML-DSA-44", "BC"), kp44, kp65, "2.16.840.1.101.3.4.3.18");
@@ -185,7 +185,7 @@ public void testPrivateKeyRecovery()
     public void testDefaultPrivateKeyEncoding()
         throws Exception
     {
-        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44");
+        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44", "BC");
 
         byte[] seed = Hex.decode("000102030405060708090a0b0c0d0e0f" + "100102030405060708090a0b0c0d0e0f");
 
@@ -205,7 +205,7 @@ public void testDefaultPrivateKeyEncoding()
     public void testSeedPrivateKeyEncoding()
         throws Exception
     {
-        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44");
+        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44", "BC");
 
         byte[] seed = Hex.decode("000102030405060708090a0b0c0d0e0f" + "100102030405060708090a0b0c0d0e0f");
 
@@ -222,7 +222,7 @@ public void testSeedPrivateKeyEncoding()
     public void testExpandedKeyPrivateKeyEncoding()
         throws Exception
     {
-        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44");
+        KeyPairGenerator kpGen44 = KeyPairGenerator.getInstance("ML-DSA-44", "BC");
 
         byte[] seed = Hex.decode("000102030405060708090a0b0c0d0e0f" + "100102030405060708090a0b0c0d0e0f");
         byte[] expandedKey = Base64.decode("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");
diff --git a/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/symmetric/test/AllTests25.java b/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/symmetric/test/AllTests25.java
@@ -17,6 +17,8 @@ public static Test suite()
     {
         TestSuite suite = new TestSuite("JDK25 Provider Tests");
         suite.addTestSuite(HKDFTest.class);
+        suite.addTestSuite(PBEPBKDF2Test.class);
+        suite.addTestSuite(SCryptTest.class);
         return suite;
     }
 }
diff --git a/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/symmetric/test/HKDFTest.java b/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/symmetric/test/HKDFTest.java
@@ -1,7 +1,6 @@
 package org.bouncycastle.jcajce.provider.symmetric.test;
 
 import junit.framework.TestCase;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;
diff --git a/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/symmetric/test/PBEPBKDF2Test.java b/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/symmetric/test/PBEPBKDF2Test.java
@@ -1,29 +1,11 @@
 package org.bouncycastle.jcajce.provider.symmetric.test;
 
 import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.EncryptionScheme;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.jcajce.provider.symmetric.PBEPBKDF2;
-import org.bouncycastle.jcajce.provider.symmetric.hkdf.HKDFParameterSpec;
 import org.bouncycastle.jcajce.provider.symmetric.pbepbkdf2.PBEPBKDF2ParameterSpec;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;
 
 import javax.crypto.KDF;
-import javax.crypto.spec.PBEKeySpec;
-import java.io.ByteArrayInputStream;
 import java.security.Security;
 
 import static org.bouncycastle.util.Arrays.areEqual;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;`
`5`	`5`	`import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;`
`6`	`6`
`7`		`-public class HKDF`
	`7`	`+class HKDF`
`8`	`8`	`{`
`9`	`9`	`private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".hkdf.";`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;`
`4`	`4`	`import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;`
`5`	`5`
`6`		`-public class SCRYPT`
	`6`	`+class SCRYPT`
`7`	`7`	`{`
`8`	`8`	`private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".scrypt.";`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`import java.security.NoSuchAlgorithmException;`
`16`	`16`	`import java.security.spec.AlgorithmParameterSpec;`
`17`	`17`
`18`		`-public class HKDFSpi`
	`18`	`+class HKDFSpi`
`19`	`19`	`extends KDFSpi`
`20`	`20`	`{`
`21`	`21`	`protected HKDFBytesGenerator hkdf;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`import static org.bouncycastle.crypto.PBEParametersGenerator.PKCS5PasswordToUTF8Bytes;`
`26`	`26`
`27`		`-public class PBEPBKDF2Spi`
	`27`	`+class PBEPBKDF2Spi`
`28`	`28`	`extends KDFSpi`
`29`	`29`	`{`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* Example KDFSpi that delegates to Bouncy Castle’s SCrypt implementation.`
`19`	`19`	`*/`
`20`		`-public class SCryptSpi`
	`20`	`+class SCryptSpi`
`21`	`21`	`extends KDFSpi`
`22`	`22`	`{`
`23`	`23`	`protected SCryptSpi(KDFParameters kdfParameters)`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public static Test suite()`
`17`	`17`	`{`
`18`	`18`	`TestSuite suite = new TestSuite("JDK25 Provider Tests");`
`19`	`19`	`suite.addTestSuite(HKDFTest.class);`
	`20`	`+ suite.addTestSuite(PBEPBKDF2Test.class);`
	`21`	`+ suite.addTestSuite(SCryptTest.class);`
`20`	`22`	`return suite;`
`21`	`23`	`}`
`22`	`24`	`}`