FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

conflict resolution · bcgit/bc-java@a679ef1 · GitHub

  1. bcgit
  2. bc-java

Repository navigation

Commit a679ef1

Browse files
dghgit
committed
conflict resolution
1 parent ed53532 commit a679ef1

10 files changed

Lines changed: 440 additions & 572 deletions

File tree

‎core/src/main/java/org/bouncycastle/internal/asn1/misc/MiscObjectIdentifiers.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,31 @@ public interface MiscObjectIdentifiers
163163
ASN1ObjectIdentifier id_composite_key = new ASN1ObjectIdentifier("2.16.840.1.114027.80.4.1");
164164

165165
ASN1ObjectIdentifier id_oracle_pkcs12_trusted_key_usage = new ASN1ObjectIdentifier("2.16.840.1.113894.746875.1.1");
166+
167+
// COMPOSITE SIGNATURES START
168+
// -- To be replaced by IANA
169+
// Composite signature related OIDs. Based https://www.ietf.org/archive/id/draft-ounsworth-pq-composite-sigs-13.html
170+
// The current OIDs are EXPERIMENTAL and are going to change.
171+
ASN1ObjectIdentifier id_composite_signatures = new ASN1ObjectIdentifier("2.16.840.1.114027.80.8.1");
172+
ASN1ObjectIdentifier id_MLDSA44_RSA2048_PSS_SHA256 = id_composite_signatures.branch("1");
173+
ASN1ObjectIdentifier id_MLDSA44_RSA2048_PKCS15_SHA256 = id_composite_signatures.branch("2");
174+
ASN1ObjectIdentifier id_MLDSA44_Ed25519_SHA512 = id_composite_signatures.branch("3");
175+
ASN1ObjectIdentifier id_MLDSA44_ECDSA_P256_SHA256 = id_composite_signatures.branch("4");
176+
ASN1ObjectIdentifier id_MLDSA44_ECDSA_brainpoolP256r1_SHA256 = id_composite_signatures.branch("5");
177+
ASN1ObjectIdentifier id_MLDSA65_RSA3072_PSS_SHA512 = id_composite_signatures.branch("6");
178+
ASN1ObjectIdentifier id_MLDSA65_RSA3072_PKCS15_SHA512 = id_composite_signatures.branch("7");
179+
ASN1ObjectIdentifier id_MLDSA65_ECDSA_P256_SHA512 = id_composite_signatures.branch("8");
180+
ASN1ObjectIdentifier id_MLDSA65_ECDSA_brainpoolP256r1_SHA512 = id_composite_signatures.branch("9");
181+
ASN1ObjectIdentifier id_MLDSA65_Ed25519_SHA512 = id_composite_signatures.branch("10");
182+
ASN1ObjectIdentifier id_MLDSA87_ECDSA_P384_SHA512 = id_composite_signatures.branch("11");
183+
ASN1ObjectIdentifier id_MLDSA87_ECDSA_brainpoolP384r1_SHA512 = id_composite_signatures.branch("12");
184+
ASN1ObjectIdentifier id_MLDSA87_Ed448_SHA512 = id_composite_signatures.branch("13");
185+
186+
// Falcon-based composites below were removed from the IETF draft in version 13 and are expected to be included in a later/separate standard.
187+
// Most likely due to the fact that the Falcon (FN-DSA) NIST standard is going to be released after the Dilithium (ML-DSA) standard.
188+
// However, we still leave their implementation for experimental usage.
189+
ASN1ObjectIdentifier id_Falcon512_ECDSA_P256_SHA256 = id_composite_signatures.branch("14");
190+
ASN1ObjectIdentifier id_Falcon512_ECDSA_brainpoolP256r1_SHA256 = id_composite_signatures.branch("15");
191+
ASN1ObjectIdentifier id_Falcon512_Ed25519_SHA512 = id_composite_signatures.branch("16");
192+
// COMPOSITE SIGNATURES END
166193
}

‎pkix/src/test/resources/org/bouncycastle/cert/test/compositeCertificateExampleRFC.pem‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎pkix/src/test/resources/org/bouncycastle/cert/test/compositePrivateKeyExample.pem‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎pkix/src/test/resources/org/bouncycastle/cert/test/compositePublicKeyExampleRFC.pem‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎prov/src/main/java/org/bouncycastle/jcajce/CompositePrivateKey.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.bouncycastle.asn1.ASN1Encoding;
55
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
66
import org.bouncycastle.asn1.DERSequence;
7-
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
7+
import org.bouncycastle.internal.asn1.misc.MiscObjectIdentifiers;
88
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
99
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
1010
import org.bouncycastle.jcajce.provider.asymmetric.compositesignatures.CompositeSignaturesConstants;

‎prov/src/main/java/org/bouncycastle/jcajce/CompositePublicKey.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.bouncycastle.asn1.ASN1Encoding;
55
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
66
import org.bouncycastle.asn1.DERSequence;
7-
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
7+
import org.bouncycastle.internal.asn1.misc.MiscObjectIdentifiers;
88
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
99
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
1010
import org.bouncycastle.jcajce.provider.asymmetric.compositesignatures.CompositeSignaturesConstants;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/compositesignatures/CompositeSignaturesConstants.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.bouncycastle.jcajce.provider.asymmetric.compositesignatures;
22

3-
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4-
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
5-
63
import java.util.HashMap;
74
import java.util.Map.Entry;
85

6+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
7+
import org.bouncycastle.internal.asn1.misc.MiscObjectIdentifiers;
8+
99

1010
/**
1111
* Helper class containing constants/mappings for composite signatures.
@@ -17,22 +17,22 @@ public abstract class CompositeSignaturesConstants
1717
* An array of supported identifiers of composite signature schemes.
1818
*/
1919
public static final ASN1ObjectIdentifier[] supportedIdentifiers = {
20-
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PSS_SHA256,
21-
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PKCS15_SHA256,
22-
MiscObjectIdentifiers.id_MLDSA44_Ed25519_SHA512,
23-
MiscObjectIdentifiers.id_MLDSA44_ECDSA_P256_SHA256,
24-
MiscObjectIdentifiers.id_MLDSA44_ECDSA_brainpoolP256r1_SHA256,
25-
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PSS_SHA512,
26-
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PKCS15_SHA512,
27-
MiscObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512,
28-
MiscObjectIdentifiers.id_MLDSA65_ECDSA_brainpoolP256r1_SHA512,
29-
MiscObjectIdentifiers.id_MLDSA65_Ed25519_SHA512,
30-
MiscObjectIdentifiers.id_MLDSA87_ECDSA_P384_SHA512,
31-
MiscObjectIdentifiers.id_MLDSA87_ECDSA_brainpoolP384r1_SHA512,
32-
MiscObjectIdentifiers.id_MLDSA87_Ed448_SHA512,
33-
MiscObjectIdentifiers.id_Falcon512_ECDSA_P256_SHA256,
34-
MiscObjectIdentifiers.id_Falcon512_ECDSA_brainpoolP256r1_SHA256,
35-
MiscObjectIdentifiers.id_Falcon512_Ed25519_SHA512,
20+
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PSS_SHA256,
21+
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PKCS15_SHA256,
22+
MiscObjectIdentifiers.id_MLDSA44_Ed25519_SHA512,
23+
MiscObjectIdentifiers.id_MLDSA44_ECDSA_P256_SHA256,
24+
MiscObjectIdentifiers.id_MLDSA44_ECDSA_brainpoolP256r1_SHA256,
25+
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PSS_SHA512,
26+
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PKCS15_SHA512,
27+
MiscObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512,
28+
MiscObjectIdentifiers.id_MLDSA65_ECDSA_brainpoolP256r1_SHA512,
29+
MiscObjectIdentifiers.id_MLDSA65_Ed25519_SHA512,
30+
MiscObjectIdentifiers.id_MLDSA87_ECDSA_P384_SHA512,
31+
MiscObjectIdentifiers.id_MLDSA87_ECDSA_brainpoolP384r1_SHA512,
32+
MiscObjectIdentifiers.id_MLDSA87_Ed448_SHA512,
33+
MiscObjectIdentifiers.id_Falcon512_ECDSA_P256_SHA256,
34+
MiscObjectIdentifiers.id_Falcon512_ECDSA_brainpoolP256r1_SHA256,
35+
MiscObjectIdentifiers.id_Falcon512_Ed25519_SHA512,
3636
};
3737

3838
/**

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL