The PKCS12-DEF-AES256-AES128(-GCM) KeyStores now use the default JCA provider search rather than BC, and PKCS12-AES256-AES128(-GCM) are registered to the BC implementations.

Author: peterdettman

docs/releasenotes.md

@@ -66,6 +66,7 @@ Date: 2026, TBD
 - The light-weight CryptoProWrapEngine (RFC 4357 sec. 6.3) diversified the key encryption key in the caller's own array, so after init the KeyParameter it was given held the diversified key, and initialising again with the same parameters - to unwrap what had just been wrapped, say - diversified it a second time and used a different key. It also failed with a NullPointerException when given no S-box, although init has a branch for that case. It now diversifies a copy, and given no S-box uses the GOST 28147 engine's default S-box for the diversification, the one the wrap itself then uses. The provider's GOST 28147 key wrap ciphers were unaffected, as they always supply an S-box and build a new KeyParameter on every init.
 - A UserKeyingMaterialSpec carrying a KDF salt was accepted by every KeyAgreement that takes one, although only the HKDF based agreements (X25519withSHA256HKDF, X448withSHA512HKDF and the RFC 8418 XDHwithSHA\*HKDF schemes) use a salt: the X9.63 and concatenation KDF agreements for EC, DH and XDH, and the ECGOST VKO agreements, derived their key without it and gave no sign of having done so. A salt given to any agreement whose KDF is not HKDF is now refused at init with an InvalidAlgorithmParameterException.
 - The light-weight ConcatenationKDFGenerator (NIST SP 800-56A concatenation KDF) threw NullPointerException from generateBytes when its KDFParameters carried no OtherInfo, although KDFParameters documents the additional input as optional and KDF1 and KDF2 already treated a null one as empty. Every provider key agreement over it that was given no user keying material hit it: ECCDHwithSHA\*CKDF initialised without a UserKeyingMaterialSpec, and ECCDHUwithSHA\*CKDF, ECMQVwithSHA\*CKDF, DHUwithSHA\*CKDF and MQVwithSHA\*CKDF initialised with a DHUParameterSpec or MQVParameterSpec that carried none. The XDH agreements were unaffected, as they substituted an empty value. A null OtherInfo now derives what an empty one does, H(counter || Z), and KDFParameters refuses a null shared secret at construction rather than leaving it to fail inside the KDF.
+- The PKCS12-DEF-AES256-AES128 and PKCS12-DEF-AES256-AES128-GCM KeyStores performed their key protection and MAC operations with the BC provider, rather than through the default JCA provider search that the other PKCS12-DEF stores use, as their implementations were built with the BC helper. They now use the default search, and the PKCS12-AES256-AES128 and PKCS12-AES256-AES128-GCM KeyStores, which had been registered to those same implementations, are now registered to the BC ones.
 
 ### 2.1.3 Additional Features and Functionality
 

prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java

@@ -34,8 +34,8 @@ public void configure(ConfigurableProvider provider)
 
             provider.addAlgorithm("KeyStore.PKCS12-3DES-40RC2", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore");
             provider.addAlgorithm("KeyStore.PKCS12-3DES-3DES", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore3DES");
-            provider.addAlgorithm("KeyStore.PKCS12-AES256-AES128", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStoreAES256");
-            provider.addAlgorithm("KeyStore.PKCS12-AES256-AES128-GCM", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStoreAES256GCM");
+            provider.addAlgorithm("KeyStore.PKCS12-AES256-AES128", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStoreAES256");
+            provider.addAlgorithm("KeyStore.PKCS12-AES256-AES128-GCM", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStoreAES256GCM");
 
             provider.addAlgorithm("KeyStore.PKCS12-DEF-3DES-40RC2", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore");
             provider.addAlgorithm("KeyStore.PKCS12-DEF-3DES-3DES", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore3DES");

prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java

@@ -2421,7 +2421,7 @@ public static class DefPKCS12KeyStoreAES256
     {
         public DefPKCS12KeyStoreAES256()
         {
-            super(new BCJcaJceHelper(), new PKCS12KeyStoreSpi(new BCJcaJceHelper(), NISTObjectIdentifiers.id_aes256_CBC, NISTObjectIdentifiers.id_aes128_CBC));
+            super(new DefaultJcaJceHelper(), new PKCS12KeyStoreSpi(new DefaultJcaJceHelper(), NISTObjectIdentifiers.id_aes256_CBC, NISTObjectIdentifiers.id_aes128_CBC));
         }
     }
 
@@ -2430,7 +2430,7 @@ public static class DefPKCS12KeyStoreAES256GCM
     {
         public DefPKCS12KeyStoreAES256GCM()
         {
-            super(new BCJcaJceHelper(), new PKCS12KeyStoreSpi(new BCJcaJceHelper(), NISTObjectIdentifiers.id_aes256_GCM, NISTObjectIdentifiers.id_aes128_GCM));
+            super(new DefaultJcaJceHelper(), new PKCS12KeyStoreSpi(new DefaultJcaJceHelper(), NISTObjectIdentifiers.id_aes256_GCM, NISTObjectIdentifiers.id_aes128_GCM));
         }
     }