Switched package from symmetric to kdf, added KDF_PACKAGE to BouncyCastleProvider

royb · royb · commit 319394e1d1ef · 2025-11-06T12:47:50.000-05:00
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -95,7 +95,7 @@ public final class BouncyCastleProvider extends Provider
 
     private static final String[] SYMMETRIC_GENERIC =
         {
-            "PBEPBKDF1", "PBEPBKDF2", "PBEPKCS12", "TLSKDF", "SCRYPT", "HKDF"
+            "PBEPBKDF1", "PBEPBKDF2", "PBEPKCS12", "TLSKDF", "SCRYPT"
         };
 
     private static final String[] SYMMETRIC_MACS =
@@ -163,6 +163,17 @@ public final class BouncyCastleProvider extends Provider
             "DRBG"
         };
 
+    /*
+     * Configurable kdfs
+     */
+    private static final String KDF_PACKAGE = "org.bouncycastle.jcajce.provider.kdf.";
+    private static final String[] KDFS =
+        {
+            "HKDF", "PBEPBKDF2", "SCRYPT"
+        };
+
+
+
     private Map<String, Service> serviceMap = new ConcurrentHashMap<String, Service>();
 
     /**
@@ -202,6 +213,8 @@ private void setup()
 
         loadAlgorithms(SECURE_RANDOM_PACKAGE, SECURE_RANDOMS);
 
+        loadAlgorithms(KDF_PACKAGE, KDFS);
+
         loadPQCKeys();  // so we can handle certificates containing them.
 
         //
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/HKDF.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/HKDF.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.bouncycastle.jcajce.provider.kdf;
 
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 
 class HKDF
 {
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".hkdf.";
+    private static final String PREFIX = "org.bouncycastle.jcajce.provider.kdf" + ".hkdf.";
 
     public static class Mappings
             extends AlgorithmProvider
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/PBEPBKDF2.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/PBEPBKDF2.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.bouncycastle.jcajce.provider.kdf;
 
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 
 class PBEPBKDF2
 {
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".pbepbkdf2.";
+    private static final String PREFIX = "org.bouncycastle.jcajce.provider.kdf" + ".pbepbkdf2.";
 
     public static class Mappings
             extends AlgorithmProvider
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/SCRYPT.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/SCRYPT.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.bouncycastle.jcajce.provider.kdf;
 
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 
 class SCRYPT
 {
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.symmetric" + ".scrypt.";
+    private static final String PREFIX = "org.bouncycastle.jcajce.provider.kdf" + ".scrypt.";
 
     public static class Mappings
             extends AlgorithmProvider
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/hkdf/HKDFParameterSpec.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/hkdf/HKDFParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.hkdf;
+package org.bouncycastle.jcajce.provider.kdf.hkdf;
 
 import org.bouncycastle.crypto.params.HKDFParameters;
 
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/hkdf/HKDFSpi.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/hkdf/HKDFSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.hkdf;
+package org.bouncycastle.jcajce.provider.kdf.hkdf;
 
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.SHA256Digest;
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/pbepbkdf2/PBEPBKDF2ParameterSpec.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/pbepbkdf2/PBEPBKDF2ParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.pbepbkdf2;
+package org.bouncycastle.jcajce.provider.kdf.pbepbkdf2;
 
 import javax.crypto.spec.PBEKeySpec;
 import java.security.spec.AlgorithmParameterSpec;
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/pbepbkdf2/PBEPBKDF2Spi.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/pbepbkdf2/PBEPBKDF2Spi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.pbepbkdf2;
+package org.bouncycastle.jcajce.provider.kdf.pbepbkdf2;
 
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.GOST3411Digest;
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/scrypt/SCryptParameterSpec.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/scrypt/SCryptParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.scrypt;
+package org.bouncycastle.jcajce.provider.kdf.scrypt;
 
 import org.bouncycastle.jcajce.spec.ScryptKeySpec;
 
diff --git a/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/scrypt/SCryptSpi.java b/prov/src/main/jdk25/org/bouncycastle/jcajce/provider/kdf/scrypt/SCryptSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.scrypt;
+package org.bouncycastle.jcajce.provider.kdf.scrypt;
 
 import org.bouncycastle.crypto.PasswordConverter;
 import org.bouncycastle.crypto.generators.SCrypt;
@@ -12,7 +12,6 @@
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidKeySpecException;
 
 /**
  * Example KDFSpi that delegates to Bouncy Castle’s SCrypt implementation.
diff --git a/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/AllTests25.java b/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/AllTests25.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.test;
+package org.bouncycastle.jcajce.provider.kdf.test;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/HKDFTest.java b/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/HKDFTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jcajce.provider.symmetric.test;
+package org.bouncycastle.jcajce.provider.kdf.test;
 
 import junit.framework.TestCase;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.jcajce.provider.symmetric.hkdf.HKDFParameterSpec;
+import org.bouncycastle.jcajce.provider.kdf.hkdf.HKDFParameterSpec;
 
 import javax.crypto.KDF;
 
diff --git a/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/PBEPBKDF2Test.java b/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/PBEPBKDF2Test.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.symmetric.test;
+package org.bouncycastle.jcajce.provider.kdf.test;
 
 import junit.framework.TestCase;
-import org.bouncycastle.jcajce.provider.symmetric.pbepbkdf2.PBEPBKDF2ParameterSpec;
+import org.bouncycastle.jcajce.provider.kdf.pbepbkdf2.PBEPBKDF2ParameterSpec;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.util.encoders.Hex;
 
diff --git a/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/SCryptTest.java b/prov/src/test/jdk25/org/bouncycastle/jcajce/provider/kdf/test/SCryptTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.symmetric.test;
+package org.bouncycastle.jcajce.provider.kdf.test;
 
 import junit.framework.TestCase;
-import org.bouncycastle.jcajce.provider.symmetric.scrypt.SCryptParameterSpec;
+import org.bouncycastle.jcajce.provider.kdf.scrypt.SCryptParameterSpec;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.bouncycastle.jcajce.provider.symmetric.hkdf;`
	`1`	`+package org.bouncycastle.jcajce.provider.kdf.hkdf;`
`2`	`2`
`3`	`3`	`import org.bouncycastle.crypto.params.HKDFParameters;`
`4`	`4`