Skip to content

Commit 7c4d661

Browse files
committed
Fixed support for COMPOSITE as algorithm name.
1 parent 00f728f commit 7c4d661

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

pkix/src/main/java/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ private static RSASSAPSSparams createPSSParams(AlgorithmIdentifier hashAlgId, in
8383

8484
static
8585
{
86-
addAlgorithm("COMPOSITE", MiscObjectIdentifiers.id_alg_composite);
87-
8886
addAlgorithm("MD2WITHRSAENCRYPTION", PKCSObjectIdentifiers.md2WithRSAEncryption);
8987
addAlgorithm("MD2WITHRSA", PKCSObjectIdentifiers.md2WithRSAEncryption);
9088
addAlgorithm("MD5WITHRSAENCRYPTION", PKCSObjectIdentifiers.md5WithRSAEncryption);

pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaContentSignerBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public class JcaContentSignerBuilder
5858

5959
static
6060
{
61+
isAlgIdFromPrivate.add("COMPOSITE");
6162
isAlgIdFromPrivate.add("DILITHIUM");
6263
isAlgIdFromPrivate.add("SPHINCS+");
6364
isAlgIdFromPrivate.add("SPHINCSPlus");

pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ public void checkCRLCompositeCreation()
29082908
CompositePublicKey compPub = new CompositePublicKey(IANAObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512, mlDsaKp.getPublic(), ecPub);
29092909
CompositePrivateKey compPrivKey = new CompositePrivateKey(IANAObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512, mlDsaKp.getPrivate(), ecPriv);
29102910

2911-
ContentSigner sigGen = new JcaContentSignerBuilder("MLDSA65-ECDSA-P256-SHA512").setProvider(BC).build(compPrivKey);
2911+
ContentSigner sigGen = new JcaContentSignerBuilder("COMPOSITE").setProvider(BC).build(compPrivKey);
29122912

29132913
Date now = new Date();
29142914

0 commit comments

Comments
 (0)