This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch pqc-camel-22114 in repository https://gitbox.apache.org/repos/asf/camel.git
commit f9740017f0e96a05530ea743f5fdcdec1f7b96f6 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Oct 23 10:12:35 2025 +0200 CAMEL-22114 - Fix camel-PQC tests with JDK 25 Signed-off-by: Andrea Cosentino <[email protected]> --- .../main/java/org/apache/camel/component/pqc/PQCProducer.java | 10 +++++----- .../component/pqc/crypto/PQCDefaultDILITHIUMMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultFalconMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultHSSMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultLMSMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultMAYOMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultMLDSAMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultPicnicMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultSLHDSAMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultSNOVAMaterial.java | 3 ++- .../component/pqc/crypto/PQCDefaultSPHINCSPLUSMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultXMSSMTMaterial.java | 3 ++- .../camel/component/pqc/crypto/PQCDefaultXMSSMaterial.java | 3 ++- .../org/apache/camel/component/pqc/PQCSignatureFalconTest.java | 5 +++-- .../org/apache/camel/component/pqc/PQCSignatureHSSTest.java | 5 +++-- .../org/apache/camel/component/pqc/PQCSignatureLMSTest.java | 5 +++-- .../org/apache/camel/component/pqc/PQCSignatureMAYOTest.java | 5 +++-- .../camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java | 6 ++++-- .../org/apache/camel/component/pqc/PQCSignaturePicnicTest.java | 5 +++-- .../camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java | 6 ++++-- .../org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java | 5 +++-- .../org/apache/camel/component/pqc/PQCSignatureSNOVATest.java | 5 +++-- .../camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java | 5 +++-- .../java/org/apache/camel/component/pqc/PQCSignatureTest.java | 5 +++-- .../camel/component/pqc/PQCSignatureWithKeyStoreTest.java | 6 ++++-- .../org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java | 5 +++-- .../org/apache/camel/component/pqc/PQCSignatureXMSSTest.java | 5 +++-- 27 files changed, 74 insertions(+), 45 deletions(-) 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 336ff5bd14b0..964266500a03 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 @@ -98,8 +98,8 @@ public class PQCProducer extends DefaultProducer { signer = getEndpoint().getConfiguration().getSigner(); if (ObjectHelper.isEmpty(signer)) { - signer = Signature - .getInstance(PQCSignatureAlgorithms.valueOf(getConfiguration().getSignatureAlgorithm()).getAlgorithm()); + PQCSignatureAlgorithms sigAlg = PQCSignatureAlgorithms.valueOf(getConfiguration().getSignatureAlgorithm()); + signer = Signature.getInstance(sigAlg.getAlgorithm(), sigAlg.getBcProvider()); } } @@ -108,9 +108,9 @@ public class PQCProducer extends DefaultProducer { keyGenerator = getEndpoint().getConfiguration().getKeyGenerator(); if (ObjectHelper.isEmpty(keyGenerator)) { - keyGenerator = KeyGenerator - .getInstance(PQCKeyEncapsulationAlgorithms.valueOf(getConfiguration().getKeyEncapsulationAlgorithm()) - .getAlgorithm()); + PQCKeyEncapsulationAlgorithms kemAlg + = PQCKeyEncapsulationAlgorithms.valueOf(getConfiguration().getKeyEncapsulationAlgorithm()); + keyGenerator = KeyGenerator.getInstance(kemAlg.getAlgorithm(), kemAlg.getBcProvider()); } } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultDILITHIUMMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultDILITHIUMMaterial.java index 0891f2c721cb..91d4e61a6093 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultDILITHIUMMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultDILITHIUMMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultDILITHIUMMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.DILITHIUM.getAlgorithm(), + PQCSignatureAlgorithms.DILITHIUM.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultFalconMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultFalconMaterial.java index 14babb2a3e88..8cec27835e86 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultFalconMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultFalconMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultFalconMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.FALCON.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.FALCON.getAlgorithm(), + PQCSignatureAlgorithms.FALCON.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultHSSMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultHSSMaterial.java index 88591122dae7..8efbcd30ff20 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultHSSMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultHSSMaterial.java @@ -41,7 +41,8 @@ public class PQCDefaultHSSMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.HSS.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.HSS.getAlgorithm(), + PQCSignatureAlgorithms.HSS.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultLMSMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultLMSMaterial.java index 7fea9b064697..70e74e67326d 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultLMSMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultLMSMaterial.java @@ -40,7 +40,8 @@ public class PQCDefaultLMSMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.LMS.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.LMS.getAlgorithm(), + PQCSignatureAlgorithms.LMS.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMAYOMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMAYOMaterial.java index b746d50e4fd6..0948b9eed9bc 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMAYOMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMAYOMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultMAYOMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.MAYO.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.MAYO.getAlgorithm(), + PQCSignatureAlgorithms.MAYO.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMLDSAMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMLDSAMaterial.java index 43a3e2e9d5d3..ec5f843b3e84 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMLDSAMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultMLDSAMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultMLDSAMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(), + PQCSignatureAlgorithms.MLDSA.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultPicnicMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultPicnicMaterial.java index fc1ac44859ac..b168b6d58f8e 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultPicnicMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultPicnicMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultPicnicMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.PICNIC.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.PICNIC.getAlgorithm(), + PQCSignatureAlgorithms.PICNIC.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSLHDSAMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSLHDSAMaterial.java index cea2a53bde98..bed39c949ab8 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSLHDSAMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSLHDSAMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultSLHDSAMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm(), + PQCSignatureAlgorithms.SLHDSA.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSNOVAMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSNOVAMaterial.java index 456fed17c8b9..2f3af59d894d 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSNOVAMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSNOVAMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultSNOVAMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.SNOVA.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.SNOVA.getAlgorithm(), + PQCSignatureAlgorithms.SNOVA.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSPHINCSPLUSMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSPHINCSPLUSMaterial.java index 9a9bfedbe67f..01506ff5a885 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSPHINCSPLUSMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultSPHINCSPLUSMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultSPHINCSPLUSMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.SPHINCSPLUS.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.SPHINCSPLUS.getAlgorithm(), + PQCSignatureAlgorithms.SPHINCSPLUS.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMTMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMTMaterial.java index b428e71cecd7..ae3629cce394 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMTMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMTMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultXMSSMTMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.XMSSMT.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.XMSSMT.getAlgorithm(), + PQCSignatureAlgorithms.XMSSMT.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMaterial.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMaterial.java index 4398cd47a79b..00e424fd092d 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMaterial.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultXMSSMaterial.java @@ -38,7 +38,8 @@ public class PQCDefaultXMSSMaterial { try { generator = prepareKeyPair(); keyPair = generator.generateKeyPair(); - signer = Signature.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm()); + signer = Signature.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm(), + PQCSignatureAlgorithms.XMSS.getBcProvider()); } catch (Exception e) { throw new RuntimeException(e); } 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 d76181ef27ac..0304b78d5b36 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 @@ -90,8 +90,9 @@ public class PQCSignatureFalconTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.FALCON.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.FALCON.getAlgorithm(), + PQCSignatureAlgorithms.FALCON.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java index e4096bc4406e..761cd8f5204a 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java @@ -95,8 +95,9 @@ public class PQCSignatureHSSTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature hssSig = Signature.getInstance(PQCSignatureAlgorithms.HSS.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature hssSig + = Signature.getInstance(PQCSignatureAlgorithms.HSS.getAlgorithm(), PQCSignatureAlgorithms.HSS.getBcProvider()); return hssSig; } } 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 f7bb98f4e400..715c79c40186 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 @@ -90,8 +90,9 @@ public class PQCSignatureLMSTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.LMS.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa + = Signature.getInstance(PQCSignatureAlgorithms.LMS.getAlgorithm(), PQCSignatureAlgorithms.LMS.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java index a1d066c01c01..146a033138c5 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java @@ -84,8 +84,9 @@ public class PQCSignatureMAYOTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MAYO.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MAYO.getAlgorithm(), + PQCSignatureAlgorithms.MAYO.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java index e6ce0659e683..9b87414371ae 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java @@ -122,6 +122,7 @@ public class PQCSignatureOnlyKeyStoreTest extends CamelTestSupport { kp.getPublic()); ContentSigner contentSigner = new JcaContentSignerBuilder(PQCSignatureAlgorithms.MLDSA.getAlgorithm()) + .setProvider(PQCSignatureAlgorithms.MLDSA.getBcProvider()) .build(kp.getPrivate()); X509Certificate certificate = new JcaX509CertificateConverter() @@ -141,8 +142,9 @@ public class PQCSignatureOnlyKeyStoreTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(), + PQCSignatureAlgorithms.MLDSA.getBcProvider()); return mlDsa; } } 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 efe7342434de..daf5b780aa5c 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 @@ -90,8 +90,9 @@ public class PQCSignaturePicnicTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.PICNIC.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.PICNIC.getAlgorithm(), + PQCSignatureAlgorithms.PICNIC.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java index 4aa4773e7dbe..026e6cd718c6 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java @@ -122,6 +122,7 @@ public class PQCSignatureSLHDSAKeystoreTest extends CamelTestSupport { kp.getPublic()); ContentSigner contentSigner = new JcaContentSignerBuilder(PQCSignatureAlgorithms.SLHDSA.getAlgorithm()) + .setProvider(PQCSignatureAlgorithms.SLHDSA.getBcProvider()) .build(kp.getPrivate()); X509Certificate certificate = new JcaX509CertificateConverter() @@ -141,8 +142,9 @@ public class PQCSignatureSLHDSAKeystoreTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm(), + PQCSignatureAlgorithms.SLHDSA.getBcProvider()); 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 c7377f9ccda7..34dfc209414b 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 @@ -88,8 +88,9 @@ public class PQCSignatureSLHDSATest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SLHDSA.getAlgorithm(), + PQCSignatureAlgorithms.SLHDSA.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java index a14fe37ffda9..d5adc6f75b9c 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java @@ -84,8 +84,9 @@ public class PQCSignatureSNOVATest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SNOVA.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SNOVA.getAlgorithm(), + PQCSignatureAlgorithms.SNOVA.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java index 322546594d60..be9ba45f9e3e 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java @@ -84,8 +84,9 @@ public class PQCSignatureSPHINCSPLUSTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SPHINCSPLUS.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.SPHINCSPLUS.getAlgorithm(), + PQCSignatureAlgorithms.SPHINCSPLUS.getBcProvider()); 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 063b625a2f18..d53bad93c0e6 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 @@ -88,8 +88,9 @@ public class PQCSignatureTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(), + PQCSignatureAlgorithms.MLDSA.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java index d1248aa5c660..b05df6519a3e 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java @@ -121,6 +121,7 @@ public class PQCSignatureWithKeyStoreTest extends CamelTestSupport { kp.getPublic()); ContentSigner contentSigner = new JcaContentSignerBuilder(PQCSignatureAlgorithms.MLDSA.getAlgorithm()) + .setProvider(PQCSignatureAlgorithms.MLDSA.getBcProvider()) .build(kp.getPrivate()); X509Certificate certificate = new JcaX509CertificateConverter() @@ -154,8 +155,9 @@ public class PQCSignatureWithKeyStoreTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.MLDSA.getAlgorithm(), + PQCSignatureAlgorithms.MLDSA.getBcProvider()); return mlDsa; } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java index 4c961e6b87af..6b9763951cf7 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java @@ -91,8 +91,9 @@ public class PQCSignatureXMSSMTTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature xmssmtSig = Signature.getInstance(PQCSignatureAlgorithms.XMSSMT.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature xmssmtSig = Signature.getInstance(PQCSignatureAlgorithms.XMSSMT.getAlgorithm(), + PQCSignatureAlgorithms.XMSSMT.getBcProvider()); return xmssmtSig; } } 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 5dd64774ad0a..6dbefb6da288 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 @@ -91,8 +91,9 @@ public class PQCSignatureXMSSTest extends CamelTestSupport { } @BindToRegistry("Signer") - public Signature getSigner() throws NoSuchAlgorithmException { - Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm()); + public Signature getSigner() throws NoSuchAlgorithmException, NoSuchProviderException { + Signature mlDsa = Signature.getInstance(PQCSignatureAlgorithms.XMSS.getAlgorithm(), + PQCSignatureAlgorithms.XMSS.getBcProvider()); return mlDsa; } }
