You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2025/04/18 09:58:26 UTC
(camel) branch main updated: CAMEL-21992 - Camel-PQC: Support more KEM Algorithms (#17802)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 00e9fa663bc CAMEL-21992 - Camel-PQC: Support more KEM Algorithms (#17802)
00e9fa663bc is described below
commit 00e9fa663bcf3202797e88e702d8c61296946f21
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 18 11:58:21 2025 +0200
CAMEL-21992 - Camel-PQC: Support more KEM Algorithms (#17802)
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../pqc/PQCKeyEncapsulationAlgorithms.java | 18 +++++++++++++++---
.../apache/camel/component/pqc/PQCProducer.java | 5 ++++-
.../component/pqc/PQCSignatureAlgorithms.java | 22 ++++++++++++++--------
.../component/pqc/PQCSymmetricAlgorithms.java | 3 ++-
.../pqc/PQCBIKEGenerateEncapsulationAESTest.java | 8 +++++---
...va => PQCCMCEGenerateEncapsulationAESTest.java} | 16 +++++++++-------
...a => PQCFRODOGenerateEncapsulationAESTest.java} | 16 +++++++++-------
...ava => PQCHQCGenerateEncapsulationAESTest.java} | 16 +++++++++-------
.../pqc/PQCMLKEMGenerateEncapsulationAESTest.java | 6 ++++--
...a => PQCMLKEMGenerateEncapsulationRC5Test.java} | 18 ++++++++++--------
...va => PQCNTRUGenerateEncapsulationAESTest.java} | 16 +++++++++-------
...=> PQCNTRULPRGenerateEncapsulationAESTest.java} | 16 +++++++++-------
...a => PQCSABERGenerateEncapsulationAESTest.java} | 16 +++++++++-------
.../PQCSignatureFalconNoSignerAutowiredTest.java | 3 ++-
.../component/pqc/PQCSignatureFalconTest.java | 5 +++--
.../camel/component/pqc/PQCSignatureLMSTest.java | 5 +++--
.../pqc/PQCSignatureNoAutowiredSignatureTest.java | 3 ++-
.../component/pqc/PQCSignaturePicnicTest.java | 5 +++--
.../component/pqc/PQCSignatureRainbowTest.java | 5 +++--
.../component/pqc/PQCSignatureSLHDSATest.java | 5 +++--
.../camel/component/pqc/PQCSignatureTest.java | 5 +++--
.../pqc/PQCSignatureWrongKeyPairSignatureTest.java | 3 ++-
.../camel/component/pqc/PQCSignatureXMSSTest.java | 5 +++--
23 files changed, 135 insertions(+), 85 deletions(-)
diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCKeyEncapsulationAlgorithms.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCKeyEncapsulationAlgorithms.java
index 8d9b4c905fb..a05fd594d42 100644
--- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCKeyEncapsulationAlgorithms.java
+++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCKeyEncapsulationAlgorithms.java
@@ -19,19 +19,31 @@ package org.apache.camel.component.pqc;
public enum PQCKeyEncapsulationAlgorithms {
// Standardized and implemented
- MLKEM("ML-KEM"),
- BIKE("BIKE");
+ MLKEM("ML-KEM", "BC"),
// Experimental and non-standardized
+ BIKE("BIKE", "BCPQC"),
+ HQC("HQC", "BCPQC"),
+ CMCE("CMCE", "BCPQC"),
+ SABER("SABER", "BCPQC"),
+ FRODO("FRODO", "BCPQC"),
+ NTRU("NTRU", "BCPQC"),
+ NTRULPRime("NTRULPRime", "BCPQC");
private final String algorithm;
+ private final String bcProvider;
- PQCKeyEncapsulationAlgorithms(String algorithm) {
+ PQCKeyEncapsulationAlgorithms(String algorithm, String bcProvider) {
this.algorithm = algorithm;
+ this.bcProvider = bcProvider;
}
public String getAlgorithm() {
return algorithm;
}
+ public String getBcProvider() {
+ return bcProvider;
+ }
+
}
diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCProducer.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCProducer.java
index 28768490d67..08fcad12404 100644
--- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCProducer.java
+++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCProducer.java
@@ -135,7 +135,10 @@ public class PQCProducer extends DefaultProducer {
private void generateEncapsulation(Exchange exchange)
throws InvalidAlgorithmParameterException {
// initialise for creating an encapsulation and shared secret.
- keyGenerator.init(new KEMGenerateSpec(getEndpoint().getConfiguration().getKeyPair().getPublic(), "AES", 128),
+ keyGenerator.init(
+ new KEMGenerateSpec(
+ getEndpoint().getConfiguration().getKeyPair().getPublic(),
+ getEndpoint().getConfiguration().getSymmetricKeyAlgorithm(), 128),
new SecureRandom());
// SecretKeyWithEncapsulation is the class to use as the secret key, it has additional
// methods on it for recovering the encapsulation as well.
diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSignatureAlgorithms.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSignatureAlgorithms.java
index afe088b206d..c2c79b3da2d 100644
--- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSignatureAlgorithms.java
+++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSignatureAlgorithms.java
@@ -19,24 +19,30 @@ package org.apache.camel.component.pqc;
public enum PQCSignatureAlgorithms {
// Standardized and implemented
- MLDSA("ML-DSA"),
- SLHDSA("SLH-DSA"),
- LMS("LMS"),
- XMSS("XMSS"),
+ MLDSA("ML-DSA", "BC"),
+ SLHDSA("SLH-DSA", "BC"),
+ LMS("LMS", "BC"),
+ XMSS("XMSS", "BCPQC"),
// Experimental and non-standardized
- FALCON("FALCON"),
- PICNIC("PICNIC"),
- RAINBOW("RAINBOW");
+ FALCON("FALCON", "BCPQC"),
+ PICNIC("PICNIC", "BCPQC"),
+ RAINBOW("RAINBOW", "BCPQC");
private final String algorithm;
+ private final String bcProvider;
- PQCSignatureAlgorithms(String algorithm) {
+ PQCSignatureAlgorithms(String algorithm, String bcProvider) {
this.algorithm = algorithm;
+ this.bcProvider = bcProvider;
}
public String getAlgorithm() {
return algorithm;
}
+ public String getBcProvider() {
+ return bcProvider;
+ }
+
}
diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSymmetricAlgorithms.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSymmetricAlgorithms.java
index 543512332bc..b54e5232428 100644
--- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSymmetricAlgorithms.java
+++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/PQCSymmetricAlgorithms.java
@@ -19,7 +19,8 @@ package org.apache.camel.component.pqc;
public enum PQCSymmetricAlgorithms {
// Standardized and implemented
- AES("AES");
+ AES("AES"),
+ RC5("RC5");
private final String algorithm;
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
index d5743e76a0a..5476424114a 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
@@ -90,7 +90,8 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("BIKE", "BCPQC");
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.BIKE.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.BIKE.getBcProvider());
kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
@@ -98,8 +99,9 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
- throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("BIKE", "BCPQC");
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.BIKE.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.BIKE.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESTest.java
similarity index 86%
copy from components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
copy to components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESTest.java
index d5743e76a0a..e3fa66a6427 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESTest.java
@@ -30,14 +30,14 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
+import org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec;
import org.bouncycastle.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
+public class PQCCMCEGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:sign")
protected MockEndpoint resultSign;
@@ -48,7 +48,7 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:verify")
protected MockEndpoint resultVerify;
- public PQCBIKEGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
+ public PQCCMCEGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
}
@Override
@@ -90,16 +90,18 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("BIKE", "BCPQC");
- kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.CMCE.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.CMCE.getBcProvider());
+ kpg.initialize(CMCEParameterSpec.mceliece8192128f, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
}
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
- throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("BIKE", "BCPQC");
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.CMCE.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.CMCE.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESTest.java
similarity index 86%
copy from components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
copy to components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESTest.java
index d5743e76a0a..eb4ac3e4a49 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESTest.java
@@ -30,14 +30,14 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
+import org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec;
import org.bouncycastle.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
+public class PQCFRODOGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:sign")
protected MockEndpoint resultSign;
@@ -48,7 +48,7 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:verify")
protected MockEndpoint resultVerify;
- public PQCBIKEGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
+ public PQCFRODOGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
}
@Override
@@ -90,16 +90,18 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("BIKE", "BCPQC");
- kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.FRODO.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.FRODO.getBcProvider());
+ kpg.initialize(FrodoParameterSpec.frodokem976aes, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
}
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
- throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("BIKE", "BCPQC");
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.FRODO.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.FRODO.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESTest.java
similarity index 86%
copy from components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
copy to components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESTest.java
index d5743e76a0a..20a55f387a6 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESTest.java
@@ -30,14 +30,14 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
+import org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec;
import org.bouncycastle.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
+public class PQCHQCGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:sign")
protected MockEndpoint resultSign;
@@ -48,7 +48,7 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:verify")
protected MockEndpoint resultVerify;
- public PQCBIKEGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
+ public PQCHQCGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
}
@Override
@@ -90,16 +90,18 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("BIKE", "BCPQC");
- kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.HQC.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.HQC.getBcProvider());
+ kpg.initialize(HQCParameterSpec.hqc192, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
}
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
- throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("BIKE", "BCPQC");
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.HQC.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.HQC.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java
index 7d866d13ea8..5df2dc7bd17 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java
@@ -90,7 +90,8 @@ public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("ML-KEM", "BC");
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.MLKEM.getBcProvider());
kpg.initialize(MLKEMParameterSpec.ml_kem_512, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
@@ -99,7 +100,8 @@ public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("ML-KEM", "BC");
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.MLKEM.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java
similarity index 84%
copy from components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java
copy to components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java
index 7d866d13ea8..b952ada3ded 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
+public class PQCMLKEMGenerateEncapsulationRC5Test extends CamelTestSupport {
@EndpointInject("mock:encapsulate")
protected MockEndpoint resultEncapsulate;
@@ -48,7 +48,7 @@ public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:extract")
protected MockEndpoint resultExtract;
- public PQCMLKEMGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
+ public PQCMLKEMGenerateEncapsulationRC5Test() throws NoSuchAlgorithmException {
}
@Override
@@ -56,9 +56,9 @@ public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:encapsulate").to("pqc:keyenc?operation=generateSecretKeyEncapsulation&symmetricKeyAlgorithm=AES")
+ from("direct:encapsulate").to("pqc:keyenc?operation=generateSecretKeyEncapsulation&symmetricKeyAlgorithm=RC5")
.to("mock:encapsulate")
- .to("pqc:keyenc?operation=extractSecretKeyEncapsulation&symmetricKeyAlgorithm=AES").to("mock:extract");
+ .to("pqc:keyenc?operation=extractSecretKeyEncapsulation&symmetricKeyAlgorithm=RC5").to("mock:extract");
}
};
}
@@ -76,12 +76,12 @@ public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
templateEncapsulate.sendBody("Hello");
resultEncapsulate.assertIsSatisfied();
assertNotNull(resultEncapsulate.getExchanges().get(0).getMessage().getBody(SecretKeyWithEncapsulation.class));
- assertEquals(PQCSymmetricAlgorithms.AES.getAlgorithm(),
+ assertEquals(PQCSymmetricAlgorithms.RC5.getAlgorithm(),
resultEncapsulate.getExchanges().get(0).getMessage().getBody(SecretKeyWithEncapsulation.class).getAlgorithm());
SecretKeyWithEncapsulation secEncrypted
= resultEncapsulate.getExchanges().get(0).getMessage().getBody(SecretKeyWithEncapsulation.class);
assertNotNull(resultExtract.getExchanges().get(0).getMessage().getBody(SecretKeyWithEncapsulation.class));
- assertEquals(PQCSymmetricAlgorithms.AES.getAlgorithm(),
+ assertEquals(PQCSymmetricAlgorithms.RC5.getAlgorithm(),
resultExtract.getExchanges().get(0).getMessage().getBody(SecretKeyWithEncapsulation.class).getAlgorithm());
SecretKeyWithEncapsulation secEncryptedExtracted
= resultExtract.getExchanges().get(0).getMessage().getBody(SecretKeyWithEncapsulation.class);
@@ -90,7 +90,8 @@ public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("ML-KEM", "BC");
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.MLKEM.getBcProvider());
kpg.initialize(MLKEMParameterSpec.ml_kem_512, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
@@ -99,7 +100,8 @@ public class PQCMLKEMGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("ML-KEM", "BC");
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.MLKEM.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.MLKEM.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESTest.java
similarity index 86%
copy from components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
copy to components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESTest.java
index d5743e76a0a..155928515b9 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESTest.java
@@ -30,14 +30,14 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
+import org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec;
import org.bouncycastle.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
+public class PQCNTRUGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:sign")
protected MockEndpoint resultSign;
@@ -48,7 +48,7 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:verify")
protected MockEndpoint resultVerify;
- public PQCBIKEGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
+ public PQCNTRUGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
}
@Override
@@ -90,16 +90,18 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("BIKE", "BCPQC");
- kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRU.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.NTRU.getBcProvider());
+ kpg.initialize(NTRUParameterSpec.ntruhps2048509, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
}
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
- throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("BIKE", "BCPQC");
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRU.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.NTRU.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRULPRGenerateEncapsulationAESTest.java
similarity index 85%
copy from components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
copy to components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRULPRGenerateEncapsulationAESTest.java
index d5743e76a0a..c9c78a5124b 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRULPRGenerateEncapsulationAESTest.java
@@ -30,14 +30,14 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
+import org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec;
import org.bouncycastle.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
+public class PQCNTRULPRGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:sign")
protected MockEndpoint resultSign;
@@ -48,7 +48,7 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:verify")
protected MockEndpoint resultVerify;
- public PQCBIKEGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
+ public PQCNTRULPRGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
}
@Override
@@ -90,16 +90,18 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("BIKE", "BCPQC");
- kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRULPRime.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.NTRULPRime.getBcProvider());
+ kpg.initialize(NTRULPRimeParameterSpec.ntrulpr761, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
}
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
- throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("BIKE", "BCPQC");
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRULPRime.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.NTRULPRime.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESTest.java
similarity index 86%
copy from components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
copy to components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESTest.java
index d5743e76a0a..0c3828a5b19 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESTest.java
@@ -30,14 +30,14 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.bouncycastle.jcajce.SecretKeyWithEncapsulation;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
+import org.bouncycastle.pqc.jcajce.spec.SABERParameterSpec;
import org.bouncycastle.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
+public class PQCSABERGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:sign")
protected MockEndpoint resultSign;
@@ -48,7 +48,7 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@EndpointInject("mock:verify")
protected MockEndpoint resultVerify;
- public PQCBIKEGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
+ public PQCSABERGenerateEncapsulationAESTest() throws NoSuchAlgorithmException {
}
@Override
@@ -90,16 +90,18 @@ public class PQCBIKEGenerateEncapsulationAESTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("BIKE", "BCPQC");
- kpg.initialize(BIKEParameterSpec.bike192, new SecureRandom());
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(PQCKeyEncapsulationAlgorithms.SABER.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.SABER.getBcProvider());
+ kpg.initialize(SABERParameterSpec.lightsaberkem256r3, new SecureRandom());
KeyPair kp = kpg.generateKeyPair();
return kp;
}
@BindToRegistry("KeyGenerator")
public KeyGenerator setKeyGenerator()
- throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyGenerator kg = KeyGenerator.getInstance("BIKE", "BCPQC");
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyGenerator kg = KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.SABER.getAlgorithm(),
+ PQCKeyEncapsulationAlgorithms.SABER.getBcProvider());
return kg;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java
index 6df67bfc356..eee38846ae7 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java
@@ -82,7 +82,8 @@ public class PQCSignatureFalconNoSignerAutowiredTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("Falcon", "BCPQC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.FALCON.getAlgorithm(),
+ PQCSignatureAlgorithms.FALCON.getBcProvider());
kpGen.initialize(FalconParameterSpec.falcon_1024);
KeyPair kp = kpGen.generateKeyPair();
return kp;
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java
index 41a1264cb40..d76181ef27a 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java
@@ -82,7 +82,8 @@ public class PQCSignatureFalconTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("Falcon", "BCPQC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.FALCON.getAlgorithm(),
+ PQCSignatureAlgorithms.FALCON.getBcProvider());
kpGen.initialize(FalconParameterSpec.falcon_1024);
KeyPair kp = kpGen.generateKeyPair();
return kp;
@@ -90,7 +91,7 @@ public class PQCSignatureFalconTest extends CamelTestSupport {
@BindToRegistry("Signer")
public Signature getSigner() throws NoSuchAlgorithmException {
- Signature mlDsa = Signature.getInstance("Falcon");
+ Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.FALCON.getAlgorithm());
return mlDsa;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java
index 40d3b6cd276..f7bb98f4e40 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java
@@ -82,7 +82,8 @@ public class PQCSignatureLMSTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("LMS", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.LMS.getAlgorithm(),
+ PQCSignatureAlgorithms.LMS.getBcProvider());
kpGen.initialize(new LMSKeyGenParameterSpec(LMSigParameters.lms_sha256_n32_h5, LMOtsParameters.sha256_n32_w1));
KeyPair kp = kpGen.generateKeyPair();
return kp;
@@ -90,7 +91,7 @@ public class PQCSignatureLMSTest extends CamelTestSupport {
@BindToRegistry("Signer")
public Signature getSigner() throws NoSuchAlgorithmException {
- Signature mlDsa = Signature.getInstance("LMS");
+ Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.LMS.getAlgorithm());
return mlDsa;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java
index 8c3fc0f1eea..e6923d64c3b 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java
@@ -80,7 +80,8 @@ public class PQCSignatureNoAutowiredSignatureTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("MLDSA", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
+ PQCSignatureAlgorithms.MLDSA.getBcProvider());
kpGen.initialize(MLDSAParameterSpec.ml_dsa_65);
KeyPair kp = kpGen.generateKeyPair();
return kp;
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java
index e809089d78c..efe7342434d 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java
@@ -82,7 +82,8 @@ public class PQCSignaturePicnicTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("Picnic", "BCPQC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.PICNIC.getAlgorithm(),
+ PQCSignatureAlgorithms.PICNIC.getBcProvider());
kpGen.initialize(PicnicParameterSpec.picnic3l5);
KeyPair kp = kpGen.generateKeyPair();
return kp;
@@ -90,7 +91,7 @@ public class PQCSignaturePicnicTest extends CamelTestSupport {
@BindToRegistry("Signer")
public Signature getSigner() throws NoSuchAlgorithmException {
- Signature mlDsa = Signature.getInstance("Picnic");
+ Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.PICNIC.getAlgorithm());
return mlDsa;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureRainbowTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureRainbowTest.java
index 315de084896..a24916737fa 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureRainbowTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureRainbowTest.java
@@ -82,7 +82,8 @@ public class PQCSignatureRainbowTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RAINBOW", "BCPQC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.RAINBOW.getAlgorithm(),
+ PQCSignatureAlgorithms.RAINBOW.getBcProvider());
kpGen.initialize(RainbowParameterSpec.rainbowVclassic);
KeyPair kp = kpGen.generateKeyPair();
return kp;
@@ -90,7 +91,7 @@ public class PQCSignatureRainbowTest extends CamelTestSupport {
@BindToRegistry("Signer")
public Signature getSigner() throws NoSuchAlgorithmException {
- Signature mlDsa = Signature.getInstance("RAINBOW");
+ Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.RAINBOW.getAlgorithm());
return mlDsa;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java
index 7b6c0fe2d86..c7377f9ccda 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java
@@ -80,7 +80,8 @@ public class PQCSignatureSLHDSATest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("SLH-DSA", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm(),
+ PQCSignatureAlgorithms.SLHDSA.getBcProvider());
kpGen.initialize(SLHDSAParameterSpec.slh_dsa_sha2_128s);
KeyPair kp = kpGen.generateKeyPair();
return kp;
@@ -88,7 +89,7 @@ public class PQCSignatureSLHDSATest extends CamelTestSupport {
@BindToRegistry("Signer")
public Signature getSigner() throws NoSuchAlgorithmException {
- Signature mlDsa = Signature.getInstance("SLH-DSA");
+ Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm());
return mlDsa;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java
index 586400bbc73..063b625a2f1 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java
@@ -80,7 +80,8 @@ public class PQCSignatureTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ML-DSA", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
+ PQCSignatureAlgorithms.MLDSA.getBcProvider());
kpGen.initialize(MLDSAParameterSpec.ml_dsa_65);
KeyPair kp = kpGen.generateKeyPair();
return kp;
@@ -88,7 +89,7 @@ public class PQCSignatureTest extends CamelTestSupport {
@BindToRegistry("Signer")
public Signature getSigner() throws NoSuchAlgorithmException {
- Signature mlDsa = Signature.getInstance("ML-DSA");
+ Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm());
return mlDsa;
}
}
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java
index 80e123908c5..0dc57b65743 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java
@@ -81,7 +81,8 @@ public class PQCSignatureWrongKeyPairSignatureTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("MLDSA", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(),
+ PQCSignatureAlgorithms.SLHDSA.getBcProvider());
kpGen.initialize(MLDSAParameterSpec.ml_dsa_65);
KeyPair kp = kpGen.generateKeyPair();
return kp;
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java
index 0a36f8ca3a3..5dd64774ad0 100644
--- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java
+++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java
@@ -83,7 +83,8 @@ public class PQCSignatureXMSSTest extends CamelTestSupport {
@BindToRegistry("Keypair")
public KeyPair setKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("XMSS", "BCPQC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm(),
+ PQCSignatureAlgorithms.XMSS.getBcProvider());
kpGen.initialize(new XMSSParameterSpec(10, XMSSParameterSpec.SHA256), new SecureRandom());
KeyPair kp = kpGen.generateKeyPair();
return kp;
@@ -91,7 +92,7 @@ public class PQCSignatureXMSSTest extends CamelTestSupport {
@BindToRegistry("Signer")
public Signature getSigner() throws NoSuchAlgorithmException {
- Signature mlDsa = Signature.getInstance("XMSS");
+ Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm());
return mlDsa;
}
}