Skip to content

CAMEL-23879: Add SecureRandomHelper to camel-util, consolidate all SecureRandom usage #24374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gnodet wants to merge 4 commits into
base: main
Choose a base branch
from
Open

CAMEL-23879: Add SecureRandomHelper to camel-util, consolidate all SecureRandom usage #24374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0257e27
Reuse SecureRandom instances instead of creating per-call (S2119)
gnodet Jul 2, 2026
bea41fb
Consolidate SecureRandom usage in camel-pqc with shared PQCSecureRandom
gnodet Jul 2, 2026
67bb235
Promote SecureRandom to framework-level SecureRandomHelper in camel-util
gnodet Jul 2, 2026
4f88e6b
Inline SecureRandomHelper calls in SelfSignedCertificateGenerator
gnodet Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.camel.health.WritableHealthCheckRepository;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jcajce.spec.KEMExtractSpec;
import org.bouncycastle.jcajce.spec.KEMGenerateSpec;
Expand Down Expand Up @@ -457,7 +458,7 @@ private void generateEncapsulation(Exchange exchange)
keyPair.getPublic(),
getEndpoint().getConfiguration().getSymmetricKeyAlgorithm(),
getEndpoint().getConfiguration().getSymmetricKeyLength()),
new SecureRandom());
SecureRandomHelper.getSecureRandom());
// SecretKeyWithEncapsulation is the class to use as the secret key, it has additional
// methods on it for recovering the encapsulation as well.
SecretKeyWithEncapsulation secEnc1 = (SecretKeyWithEncapsulation) keyGenerator.generateKey();
Expand All @@ -480,7 +481,7 @@ private void extractEncapsulation(Exchange exchange)
keyPair.getPrivate(), payload.getEncapsulation(),
PQCSymmetricAlgorithms.valueOf(getConfiguration().getSymmetricKeyAlgorithm()).getAlgorithm(),
getEndpoint().getConfiguration().getSymmetricKeyLength()),
new SecureRandom());
SecureRandomHelper.getSecureRandom());

// initialise for extracting the shared secret from the encapsulation.
SecretKeyWithEncapsulation secEnc2 = (SecretKeyWithEncapsulation) keyGenerator.generateKey();
Expand Down
3 changes: 2 additions & 1 deletion ...amel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMLDSAMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.security.*;

import org.apache.camel.component.pqc.PQCSignatureAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
Expand Down Expand Up @@ -49,7 +50,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
PQCSignatureAlgorithms.MLDSA.getBcProvider());
kpGen.initialize(MLDSAParameterSpec.ml_dsa_65, new SecureRandom());
kpGen.initialize(MLDSAParameterSpec.ml_dsa_65, SecureRandomHelper.getSecureRandom());
return kpGen;
}
}
3 changes: 2 additions & 1 deletion ...mel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSLHDSAMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.security.*;

import org.apache.camel.component.pqc.PQCSignatureAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.spec.SLHDSAParameterSpec;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
Expand Down Expand Up @@ -49,7 +50,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm(),
PQCSignatureAlgorithms.SLHDSA.getBcProvider());
kpGen.initialize(SLHDSAParameterSpec.slh_dsa_sha2_128s, new SecureRandom());
kpGen.initialize(SLHDSAParameterSpec.slh_dsa_sha2_128s, SecureRandomHelper.getSecureRandom());
return kpGen;
}
}
3 changes: 2 additions & 1 deletion ...qc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSPHINCSPLUSMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.security.*;

import org.apache.camel.component.pqc.PQCSignatureAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec;
Expand Down Expand Up @@ -49,7 +50,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.SPHINCSPLUS.getAlgorithm(),
PQCSignatureAlgorithms.SPHINCSPLUS.getBcProvider());
kpGen.initialize(SPHINCSPlusParameterSpec.haraka_256s, new SecureRandom());
kpGen.initialize(SPHINCSPlusParameterSpec.haraka_256s, SecureRandomHelper.getSecureRandom());
return kpGen;
}
}
3 changes: 2 additions & 1 deletion ...mel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMTMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.security.*;

import org.apache.camel.component.pqc.PQCSignatureAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec;
Expand Down Expand Up @@ -49,7 +50,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.XMSSMT.getAlgorithm(),
PQCSignatureAlgorithms.XMSSMT.getBcProvider());
kpGen.initialize(XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256, new SecureRandom());
kpGen.initialize(XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256, SecureRandomHelper.getSecureRandom());
return kpGen;
}
}
3 changes: 2 additions & 1 deletion ...camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.security.*;

import org.apache.camel.component.pqc.PQCSignatureAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec;
Expand Down Expand Up @@ -49,7 +50,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm(),
PQCSignatureAlgorithms.XMSS.getBcProvider());
kpGen.initialize(new XMSSParameterSpec(10, XMSSParameterSpec.SHA256), new SecureRandom());
kpGen.initialize(new XMSSParameterSpec(10, XMSSParameterSpec.SHA256), SecureRandomHelper.getSecureRandom());
return kpGen;
}
}
7 changes: 4 additions & 3 deletions ...nents/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/hybrid/HybridKEM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;

import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.crypto.digests.SHA256Digest;
import org.bouncycastle.crypto.digests.SHA384Digest;
import org.bouncycastle.crypto.digests.SHA512Digest;
Expand Down Expand Up @@ -96,7 +97,7 @@ public static HybridEncapsulationResult encapsulate(
// Perform PQC KEM encapsulation
pqcKemGenerator.init(
new KEMGenerateSpec(pqcPublicKey, symmetricAlgorithm, keyLength),
new SecureRandom());
SecureRandomHelper.getSecureRandom());
SecretKeyWithEncapsulation pqcResult = (SecretKeyWithEncapsulation) pqcKemGenerator.generateKey();
byte[] pqcSharedSecret = pqcResult.getEncoded();
byte[] pqcEncapsulation = pqcResult.getEncapsulation();
Expand Down Expand Up @@ -167,7 +168,7 @@ public static SecretKey extract(
// Perform PQC KEM extraction
pqcKemGenerator.init(
new KEMExtractSpec(pqcPrivateKey, components.pqcEncapsulation(), symmetricAlgorithm, keyLength),
new SecureRandom());
SecureRandomHelper.getSecureRandom());
SecretKeyWithEncapsulation pqcResult = (SecretKeyWithEncapsulation) pqcKemGenerator.generateKey();
byte[] pqcSharedSecret = pqcResult.getEncoded();

Expand Down Expand Up @@ -275,7 +276,7 @@ private static KeyPair generateEphemeralKeyPair(String algorithm) throws Excepti
if ("EC".equals(algorithm)) {
kpg = KeyPairGenerator.getInstance("EC");
// Default to P-256
kpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
kpg.initialize(new ECGenParameterSpec("secp256r1"), SecureRandomHelper.getSecureRandom());
} else if ("X25519".equals(algorithm) || "XDH".equals(algorithm)) {
kpg = KeyPairGenerator.getInstance("X25519");
} else if ("X448".equals(algorithm)) {
Expand Down
5 changes: 3 additions & 2 deletions ...c/main/java/org/apache/camel/component/pqc/crypto/hybrid/PQCDefaultECDHMLKEMMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.spec.MLKEMParameterSpec;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
Expand Down Expand Up @@ -50,15 +51,15 @@ public class PQCDefaultECDHMLKEMMaterial {
try {
// Generate ECDH P-256 key pair
KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC", "BC");
ecKpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
ecKpg.initialize(new ECGenParameterSpec("secp256r1"), SecureRandomHelper.getSecureRandom());
classicalKeyPair = ecKpg.generateKeyPair();
classicalKeyAgreement = KeyAgreement.getInstance("ECDH", "BC");

// Generate ML-KEM-768 key pair
KeyPairGenerator mlkemKpg = KeyPairGenerator.getInstance(
PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.MLKEM.getBcProvider());
mlkemKpg.initialize(MLKEMParameterSpec.ml_kem_768, new SecureRandom());
mlkemKpg.initialize(MLKEMParameterSpec.ml_kem_768, SecureRandomHelper.getSecureRandom());
pqcKeyPair = mlkemKpg.generateKeyPair();
pqcKeyGenerator = KeyGenerator.getInstance(
PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
Expand Down
5 changes: 3 additions & 2 deletions .../main/java/org/apache/camel/component/pqc/crypto/hybrid/PQCDefaultECDSAMLDSAMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.security.spec.ECGenParameterSpec;

import org.apache.camel.component.pqc.PQCSignatureAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
Expand Down Expand Up @@ -49,15 +50,15 @@ public class PQCDefaultECDSAMLDSAMaterial {
try {
// Generate ECDSA P-256 key pair
KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC", "BC");
ecKpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
ecKpg.initialize(new ECGenParameterSpec("secp256r1"), SecureRandomHelper.getSecureRandom());
classicalKeyPair = ecKpg.generateKeyPair();
classicalSigner = Signature.getInstance("SHA256withECDSA", "BC");

// Generate ML-DSA-65 key pair
KeyPairGenerator mldsaKpg = KeyPairGenerator.getInstance(
PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
PQCSignatureAlgorithms.MLDSA.getBcProvider());
mldsaKpg.initialize(MLDSAParameterSpec.ml_dsa_65, new SecureRandom());
mldsaKpg.initialize(MLDSAParameterSpec.ml_dsa_65, SecureRandomHelper.getSecureRandom());
pqcKeyPair = mldsaKpg.generateKeyPair();
pqcSigner = Signature.getInstance(
PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/org/apache/camel/component/pqc/crypto/hybrid/PQCDefaultEd25519MLDSAMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.security.*;

import org.apache.camel.component.pqc.PQCSignatureAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
Expand Down Expand Up @@ -53,7 +54,7 @@ public class PQCDefaultEd25519MLDSAMaterial {
KeyPairGenerator mldsaKpg = KeyPairGenerator.getInstance(
PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
PQCSignatureAlgorithms.MLDSA.getBcProvider());
mldsaKpg.initialize(MLDSAParameterSpec.ml_dsa_65, new SecureRandom());
mldsaKpg.initialize(MLDSAParameterSpec.ml_dsa_65, SecureRandomHelper.getSecureRandom());
pqcKeyPair = mldsaKpg.generateKeyPair();
pqcSigner = Signature.getInstance(
PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
Expand Down
3 changes: 2 additions & 1 deletion ...main/java/org/apache/camel/component/pqc/crypto/hybrid/PQCDefaultX25519MLKEMMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.spec.MLKEMParameterSpec;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
Expand Down Expand Up @@ -63,7 +64,7 @@ public class PQCDefaultX25519MLKEMMaterial {
KeyPairGenerator mlkemKpg = KeyPairGenerator.getInstance(
PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.MLKEM.getBcProvider());
mlkemKpg.initialize(MLKEMParameterSpec.ml_kem_768, new SecureRandom());
mlkemKpg.initialize(MLKEMParameterSpec.ml_kem_768, SecureRandomHelper.getSecureRandom());
pqcKeyPair = mlkemKpg.generateKeyPair();
pqcKeyGenerator = KeyGenerator.getInstance(
PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
Expand Down
3 changes: 2 additions & 1 deletion ...l-pqc/src/main/java/org/apache/camel/component/pqc/crypto/kem/PQCDefaultBIKEMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.BIKE.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.BIKE.getBcProvider());
kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
kpg.initialize(BIKEParameterSpec.bike192, SecureRandomHelper.getSecureRandom());
return kpg;
}

Expand Down
3 changes: 2 additions & 1 deletion ...l-pqc/src/main/java/org/apache/camel/component/pqc/crypto/kem/PQCDefaultCMCEMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.CMCE.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.CMCE.getBcProvider());
kpg.initialize(CMCEParameterSpec.mceliece8192128f, new SecureRandom());
kpg.initialize(CMCEParameterSpec.mceliece8192128f, SecureRandomHelper.getSecureRandom());
return kpg;
}

Expand Down
3 changes: 2 additions & 1 deletion ...-pqc/src/main/java/org/apache/camel/component/pqc/crypto/kem/PQCDefaultFRODOMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.FRODO.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.FRODO.getBcProvider());
kpg.initialize(FrodoParameterSpec.frodokem976aes, new SecureRandom());
kpg.initialize(FrodoParameterSpec.frodokem976aes, SecureRandomHelper.getSecureRandom());
return kpg;
}

Expand Down
3 changes: 2 additions & 1 deletion ...el-pqc/src/main/java/org/apache/camel/component/pqc/crypto/kem/PQCDefaultHQCMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.HQC.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.HQC.getBcProvider());
kpg.initialize(HQCParameterSpec.hqc192, new SecureRandom());
kpg.initialize(HQCParameterSpec.hqc192, SecureRandomHelper.getSecureRandom());
return kpg;
}

Expand Down
3 changes: 2 additions & 1 deletion ...-pqc/src/main/java/org/apache/camel/component/pqc/crypto/kem/PQCDefaultKYBERMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.KyberParameterSpec;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.KYBER.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.KYBER.getBcProvider());
kpg.initialize(KyberParameterSpec.kyber1024, new SecureRandom());
kpg.initialize(KyberParameterSpec.kyber1024, SecureRandomHelper.getSecureRandom());
return kpg;
}

Expand Down
3 changes: 2 additions & 1 deletion ...-pqc/src/main/java/org/apache/camel/component/pqc/crypto/kem/PQCDefaultMLKEMMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jcajce.spec.MLKEMParameterSpec;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.MLKEM.getBcProvider());
kpg.initialize(MLKEMParameterSpec.ml_kem_512, new SecureRandom());
kpg.initialize(MLKEMParameterSpec.ml_kem_512, SecureRandomHelper.getSecureRandom());
return kpg;
}

Expand Down
3 changes: 2 additions & 1 deletion ...src/main/java/org/apache/camel/component/pqc/crypto/kem/PQCDefaultNTRULPRimeMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.crypto.KeyGenerator;

import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms;
import org.apache.camel.util.SecureRandomHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
import org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected static KeyPairGenerator prepareKeyPair()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRULPRime.getAlgorithm(),
PQCKeyEncapsulationAlgorithms.NTRULPRime.getBcProvider());
kpg.initialize(NTRULPRimeParameterSpec.ntrulpr761, new SecureRandom());
kpg.initialize(NTRULPRimeParameterSpec.ntrulpr761, SecureRandomHelper.getSecureRandom());
return kpg;
}

Expand Down
Loading
Loading