Skip to content

Commit bc84e87

Browse files
peterdettmanpeterdettman
committed
Refactoring in OID registries
1 parent ac32a41 commit bc84e87

File tree

12 files changed

+178
-150
lines changed

12 files changed

+178
-150
lines changed

‎core/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.bouncycastle.asn1.ocsp;
22

33
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
45

56
/**
67
* OIDs for <a href="https://tools.ietf.org/html/rfc2560">RFC 2560</a> and <a href="https://tools.ietf.org/html/rfc6960">RFC 6960</a>
@@ -9,26 +10,24 @@
910
public interface OCSPObjectIdentifiers
1011
{
1112
/** OID: 1.3.6.1.5.5.7.48.1 */
12-
static final ASN1ObjectIdentifier id_pkix_ocsp = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1");
13+
ASN1ObjectIdentifier id_pkix_ocsp = X509ObjectIdentifiers.id_ad_ocsp;
14+
1315
/** OID: 1.3.6.1.5.5.7.48.1.1 */
14-
static final ASN1ObjectIdentifier id_pkix_ocsp_basic = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.1");
15-
16+
ASN1ObjectIdentifier id_pkix_ocsp_basic = id_pkix_ocsp.branch("1");
1617
/** OID: 1.3.6.1.5.5.7.48.1.2 */
17-
static final ASN1ObjectIdentifier id_pkix_ocsp_nonce = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.2");
18+
ASN1ObjectIdentifier id_pkix_ocsp_nonce = id_pkix_ocsp.branch("2");
1819
/** OID: 1.3.6.1.5.5.7.48.1.3 */
19-
static final ASN1ObjectIdentifier id_pkix_ocsp_crl = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.3");
20-
20+
ASN1ObjectIdentifier id_pkix_ocsp_crl = id_pkix_ocsp.branch("3");
2121
/** OID: 1.3.6.1.5.5.7.48.1.4 */
22-
static final ASN1ObjectIdentifier id_pkix_ocsp_response = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.4");
22+
ASN1ObjectIdentifier id_pkix_ocsp_response = id_pkix_ocsp.branch("4");
2323
/** OID: 1.3.6.1.5.5.7.48.1.5 */
24-
static final ASN1ObjectIdentifier id_pkix_ocsp_nocheck = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.5");
24+
ASN1ObjectIdentifier id_pkix_ocsp_nocheck = id_pkix_ocsp.branch("5");
2525
/** OID: 1.3.6.1.5.5.7.48.1.6 */
26-
static final ASN1ObjectIdentifier id_pkix_ocsp_archive_cutoff = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.6");
26+
ASN1ObjectIdentifier id_pkix_ocsp_archive_cutoff = id_pkix_ocsp.branch("6");
2727
/** OID: 1.3.6.1.5.5.7.48.1.7 */
28-
static final ASN1ObjectIdentifier id_pkix_ocsp_service_locator = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.7");
29-
30-
31-
static final ASN1ObjectIdentifier id_pkix_ocsp_pref_sig_algs = id_pkix_ocsp.branch("8");
32-
33-
static final ASN1ObjectIdentifier id_pkix_ocsp_extended_revoke = id_pkix_ocsp.branch("9");
28+
ASN1ObjectIdentifier id_pkix_ocsp_service_locator = id_pkix_ocsp.branch("7");
29+
/** OID: 1.3.6.1.5.5.7.48.1.8 */
30+
ASN1ObjectIdentifier id_pkix_ocsp_pref_sig_algs = id_pkix_ocsp.branch("8");
31+
/** OID: 1.3.6.1.5.5.7.48.1.9 */
32+
ASN1ObjectIdentifier id_pkix_ocsp_extended_revoke = id_pkix_ocsp.branch("9");
3433
}

‎core/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,20 +244,22 @@ public interface PKCSObjectIdentifiers
244244

245245

246246
/** S/MIME: Algorithm Identifiers ; 1.2.840.113549.1.9.16.3 */
247-
ASN1ObjectIdentifier id_alg = id_smime.branch("3");
247+
ASN1ObjectIdentifier smime_alg = id_smime.branch("3");
248+
/** @deprecated use smime_alg instead */
249+
ASN1ObjectIdentifier id_alg = id_smime.branch("3");
248250

249251
/** PKCS#9: 1.2.840.113549.1.9.16.3.5 */
250-
ASN1ObjectIdentifier id_alg_ESDH = id_alg.branch("5");
252+
ASN1ObjectIdentifier id_alg_ESDH = smime_alg.branch("5");
251253
/** PKCS#9: 1.2.840.113549.1.9.16.3.6 */
252-
ASN1ObjectIdentifier id_alg_CMS3DESwrap = id_alg.branch("6");
254+
ASN1ObjectIdentifier id_alg_CMS3DESwrap = smime_alg.branch("6");
253255
/** PKCS#9: 1.2.840.113549.1.9.16.3.7 */
254-
ASN1ObjectIdentifier id_alg_CMSRC2wrap = id_alg.branch("7");
256+
ASN1ObjectIdentifier id_alg_CMSRC2wrap = smime_alg.branch("7");
255257
/** PKCS#9: 1.2.840.113549.1.9.16.3.8 */
256-
ASN1ObjectIdentifier id_alg_zlibCompress = id_alg.branch("8");
258+
ASN1ObjectIdentifier id_alg_zlibCompress = smime_alg.branch("8");
257259
/** PKCS#9: 1.2.840.113549.1.9.16.3.9 */
258-
ASN1ObjectIdentifier id_alg_PWRI_KEK = id_alg.branch("9");
260+
ASN1ObjectIdentifier id_alg_PWRI_KEK = smime_alg.branch("9");
259261
/** PKCS#9: 1.2.840.113549.1.9.16.3.10 */
260-
ASN1ObjectIdentifier id_alg_SSDH = id_alg.branch("10");
262+
ASN1ObjectIdentifier id_alg_SSDH = smime_alg.branch("10");
261263

262264
/**
263265
* <pre>
@@ -269,15 +271,15 @@ public interface PKCSObjectIdentifiers
269271
* }
270272
* </pre>
271273
*/
272-
ASN1ObjectIdentifier id_rsa_KEM = id_alg.branch("14");
274+
ASN1ObjectIdentifier id_rsa_KEM = smime_alg.branch("14");
273275

274276

275277
/**
276278
* id-alg-hss-lms-hashsig OBJECT IDENTIFIER ::= { iso(1)
277279
* member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9)
278280
* smime(16) alg(3) 17 }
279281
*/
280-
public static final ASN1ObjectIdentifier id_alg_hss_lms_hashsig = id_alg.branch("17");
282+
public static final ASN1ObjectIdentifier id_alg_hss_lms_hashsig = smime_alg.branch("17");
281283

282284
/**
283285
* <pre>
@@ -288,31 +290,31 @@ public interface PKCSObjectIdentifiers
288290
* AEADChaCha20Poly1305Nonce ::= OCTET STRING (SIZE(12))
289291
* </pre>
290292
*/
291-
ASN1ObjectIdentifier id_alg_AEADChaCha20Poly1305 = id_alg.branch("18");
293+
ASN1ObjectIdentifier id_alg_AEADChaCha20Poly1305 = smime_alg.branch("18");
292294

293295
/**
294296
* <pre>
295297
* id-alg-hkdf-with-sha256 OBJECT IDENTIFIER ::= { iso(1) member-body(2)
296298
* us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) alg(3) 28 }
297299
* </pre>
298300
*/
299-
ASN1ObjectIdentifier id_alg_hkdf_with_sha256 = id_alg.branch("28");
301+
ASN1ObjectIdentifier id_alg_hkdf_with_sha256 = smime_alg.branch("28");
300302

301303
/**
302304
* <pre>
303305
* id-alg-hkdf-with-sha384 OBJECT IDENTIFIER ::= { iso(1) member-body(2)
304306
* us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) alg(3) 29 }
305307
* </pre>
306308
*/
307-
ASN1ObjectIdentifier id_alg_hkdf_with_sha384 = id_alg.branch("29");
309+
ASN1ObjectIdentifier id_alg_hkdf_with_sha384 = smime_alg.branch("29");
308310

309311
/**
310312
* <pre>
311313
* id-alg-hkdf-with-sha512 OBJECT IDENTIFIER ::= { iso(1) member-body(2)
312314
* us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) alg(3) 30 }
313315
* </pre>
314316
*/
315-
ASN1ObjectIdentifier id_alg_hkdf_with_sha512 = id_alg.branch("30");
317+
ASN1ObjectIdentifier id_alg_hkdf_with_sha512 = smime_alg.branch("30");
316318

317319
//
318320
// id-cti OBJECT IDENTIFIER ::= {iso(1) member-body(2) usa(840)

‎core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,29 +103,29 @@ public class BCStyle
103103
/**
104104
* RFC 3039 DateOfBirth - GeneralizedTime - YYYYMMDD000000Z
105105
*/
106-
public static final ASN1ObjectIdentifier DATE_OF_BIRTH = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.9.1").intern();
106+
public static final ASN1ObjectIdentifier DATE_OF_BIRTH = X509ObjectIdentifiers.id_pda.branch("1").intern();
107107

108108
/**
109109
* RFC 3039 PlaceOfBirth - DirectoryString(SIZE(1..128)
110110
*/
111-
public static final ASN1ObjectIdentifier PLACE_OF_BIRTH = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.9.2").intern();
111+
public static final ASN1ObjectIdentifier PLACE_OF_BIRTH = X509ObjectIdentifiers.id_pda.branch("2").intern();
112112

113113
/**
114114
* RFC 3039 Gender - PrintableString (SIZE(1)) -- "M", "F", "m" or "f"
115115
*/
116-
public static final ASN1ObjectIdentifier GENDER = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.9.3").intern();
116+
public static final ASN1ObjectIdentifier GENDER = X509ObjectIdentifiers.id_pda.branch("3").intern();
117117

118118
/**
119119
* RFC 3039 CountryOfCitizenship - PrintableString (SIZE (2)) -- ISO 3166
120120
* codes only
121121
*/
122-
public static final ASN1ObjectIdentifier COUNTRY_OF_CITIZENSHIP = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.9.4").intern();
122+
public static final ASN1ObjectIdentifier COUNTRY_OF_CITIZENSHIP = X509ObjectIdentifiers.id_pda.branch("4").intern();
123123

124124
/**
125125
* RFC 3039 CountryOfResidence - PrintableString (SIZE (2)) -- ISO 3166
126126
* codes only
127127
*/
128-
public static final ASN1ObjectIdentifier COUNTRY_OF_RESIDENCE = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.9.5").intern();
128+
public static final ASN1ObjectIdentifier COUNTRY_OF_RESIDENCE = X509ObjectIdentifiers.id_pda.branch("5").intern();
129129

130130

131131
/**

‎core/src/main/java/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
package org.bouncycastle.asn1.x509;
22

33
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
import org.bouncycastle.internal.asn1.misc.MiscObjectIdentifiers;
45

56
public interface X509ObjectIdentifiers
67
{
8+
static final ASN1ObjectIdentifier attributeType = new ASN1ObjectIdentifier("2.5.4").intern();
9+
710
/** Subject RDN components: commonName = 2.5.4.3 */
8-
static final ASN1ObjectIdentifier commonName = new ASN1ObjectIdentifier("2.5.4.3").intern();
11+
static final ASN1ObjectIdentifier commonName = attributeType.branch("3").intern();
912
/** Subject RDN components: countryName = 2.5.4.6 */
10-
static final ASN1ObjectIdentifier countryName = new ASN1ObjectIdentifier("2.5.4.6").intern();
13+
static final ASN1ObjectIdentifier countryName = attributeType.branch("6").intern();
1114
/** Subject RDN components: localityName = 2.5.4.7 */
12-
static final ASN1ObjectIdentifier localityName = new ASN1ObjectIdentifier("2.5.4.7").intern();
15+
static final ASN1ObjectIdentifier localityName = attributeType.branch("7").intern();
1316
/** Subject RDN components: stateOrProvinceName = 2.5.4.8 */
14-
static final ASN1ObjectIdentifier stateOrProvinceName = new ASN1ObjectIdentifier("2.5.4.8").intern();
17+
static final ASN1ObjectIdentifier stateOrProvinceName = attributeType.branch("8").intern();
1518
/** Subject RDN components: organization = 2.5.4.10 */
16-
static final ASN1ObjectIdentifier organization = new ASN1ObjectIdentifier("2.5.4.10").intern();
19+
static final ASN1ObjectIdentifier organization = attributeType.branch("10").intern();
1720
/** Subject RDN components: organizationalUnitName = 2.5.4.11 */
18-
static final ASN1ObjectIdentifier organizationalUnitName = new ASN1ObjectIdentifier("2.5.4.11").intern();
21+
static final ASN1ObjectIdentifier organizationalUnitName = attributeType.branch("11").intern();
1922

2023
/** Subject RDN components: telephone_number = 2.5.4.20 */
21-
static final ASN1ObjectIdentifier id_at_telephoneNumber = new ASN1ObjectIdentifier("2.5.4.20").intern();
24+
static final ASN1ObjectIdentifier id_at_telephoneNumber = attributeType.branch("20").intern();
2225
/** Subject RDN components: name = 2.5.4.41 */
23-
static final ASN1ObjectIdentifier id_at_name = new ASN1ObjectIdentifier("2.5.4.41").intern();
24-
25-
static final ASN1ObjectIdentifier id_at_organizationIdentifier = new ASN1ObjectIdentifier("2.5.4.97").intern();
26+
static final ASN1ObjectIdentifier id_at_name = attributeType.branch("41").intern();
27+
/** Subject RDN components: organizationIdentifier = 2.5.4.97 */
28+
static final ASN1ObjectIdentifier id_at_organizationIdentifier = attributeType.branch("97").intern();
2629

2730
/**
2831
* id-SHA1 OBJECT IDENTIFIER ::=
@@ -56,45 +59,44 @@ public interface X509ObjectIdentifiers
5659
*/
5760
static final ASN1ObjectIdentifier id_pkix = new ASN1ObjectIdentifier("1.3.6.1.5.5.7");
5861

62+
/**
63+
* private internet extensions; OID = 1.3.6.1.5.5.7.1
64+
*/
65+
static final ASN1ObjectIdentifier id_pe = id_pkix.branch("1");
66+
67+
/** 1.3.6.1.5.5.7.6 */
68+
static final ASN1ObjectIdentifier pkix_algorithms = id_pkix.branch("6");
69+
5970
/**
6071
* id-RSASSA-PSS-SHAKE128 OBJECT IDENTIFIER ::= { iso(1)
6172
* identified-organization(3) dod(6) internet(1)
6273
* security(5) mechanisms(5) pkix(7) algorithms(6) 30 }
6374
*/
64-
static final ASN1ObjectIdentifier id_rsassa_pss_shake128 = id_pkix.branch("6.30");
75+
static final ASN1ObjectIdentifier id_rsassa_pss_shake128 = pkix_algorithms.branch("30");
6576

6677
/**
6778
* id-RSASSA-PSS-SHAKE256 OBJECT IDENTIFIER ::= { iso(1)
6879
* identified-organization(3) dod(6) internet(1)
6980
* security(5) mechanisms(5) pkix(7) algorithms(6) 31 }
7081
*/
71-
static final ASN1ObjectIdentifier id_rsassa_pss_shake256 = id_pkix.branch("6.31");
82+
static final ASN1ObjectIdentifier id_rsassa_pss_shake256 = pkix_algorithms.branch("31");
7283

7384
/**
7485
* id-ecdsa-with-shake128 OBJECT IDENTIFIER ::= { iso(1)
7586
* identified-organization(3) dod(6) internet(1)
7687
* security(5) mechanisms(5) pkix(7) algorithms(6) 32 }
7788
*/
78-
static final ASN1ObjectIdentifier id_ecdsa_with_shake128 = id_pkix.branch("6.32");
89+
static final ASN1ObjectIdentifier id_ecdsa_with_shake128 = pkix_algorithms.branch("32");
7990

8091
/**
8192
* id-ecdsa-with-shake256 OBJECT IDENTIFIER ::= { iso(1)
8293
* identified-organization(3) dod(6) internet(1)
8394
* security(5) mechanisms(5) pkix(7) algorithms(6) 33 }
8495
*/
85-
static final ASN1ObjectIdentifier id_ecdsa_with_shake256 = id_pkix.branch("6.33");
96+
static final ASN1ObjectIdentifier id_ecdsa_with_shake256 = pkix_algorithms.branch("33");
8697

87-
/**
88-
* private internet extensions; OID = 1.3.6.1.5.5.7.1
89-
*/
90-
static final ASN1ObjectIdentifier id_pe = id_pkix.branch("1");
91-
92-
/**
93-
* ISO ARC for standard certificate and CRL extensions
94-
* <p>
95-
* OID: 2.5.29
96-
*/
97-
static final ASN1ObjectIdentifier id_ce = new ASN1ObjectIdentifier("2.5.29");
98+
/** 1.3.6.1.5.5.7.9 */
99+
static final ASN1ObjectIdentifier id_pda = id_pkix.branch("9");
98100

99101
/** id-pkix OID: 1.3.6.1.5.5.7.48 */
100102
static final ASN1ObjectIdentifier id_ad = id_pkix.branch("48");
@@ -108,10 +110,17 @@ public interface X509ObjectIdentifiers
108110
/** OID for crl uri in AuthorityInformationAccess extension */
109111
static final ASN1ObjectIdentifier crlAccessMethod = id_ad_caIssuers;
110112

113+
/**
114+
* ISO ARC for standard certificate and CRL extensions
115+
* <p>
116+
* OID: 2.5.29
117+
*/
118+
static final ASN1ObjectIdentifier id_ce = new ASN1ObjectIdentifier("2.5.29");
111119

112120
/**
113121
* id-PasswordBasedMac OBJECT IDENTIFIER ::= { iso(1) member-body(2)
114122
* us(840) nt(113533) nsn(7) algorithms(66) 13 }
123+
* @deprecated Use CRMFObjectIdentifiers.passwordBasedMac instead
115124
*/
116-
static final ASN1ObjectIdentifier id_PasswordBasedMac = new ASN1ObjectIdentifier("1.2.840.113533.7.66.13");
125+
static final ASN1ObjectIdentifier id_PasswordBasedMac = MiscObjectIdentifiers.entrust.branch("66.13");
117126
}

‎core/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package org.bouncycastle.asn1.x509.qualified;
22

33
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
45

56
public interface RFC3739QCObjectIdentifiers
67
{
8+
/** OID: 1.3.6.1.5.5.7.11 */
9+
ASN1ObjectIdentifier id_qcs = X509ObjectIdentifiers.id_pkix.branch("11");
710
/** OID: 1.3.6.1.5.5.7.11.1 */
8-
static final ASN1ObjectIdentifier id_qcs_pkixQCSyntax_v1 = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.11.1");
11+
ASN1ObjectIdentifier id_qcs_pkixQCSyntax_v1 = id_qcs.branch("1");
912
/** OID: 1.3.6.1.5.5.7.11.2 */
10-
static final ASN1ObjectIdentifier id_qcs_pkixQCSyntax_v2 = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.11.2");
13+
ASN1ObjectIdentifier id_qcs_pkixQCSyntax_v2 = id_qcs.branch("2");
1114
}

‎pkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
77
import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
88
import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
9-
import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
109
import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
1110
import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
1211
import org.bouncycastle.asn1.edec.EdECObjectIdentifiers;
@@ -71,8 +70,8 @@ public DefaultCMSSignatureAlgorithmNameGenerator()
7170
addEntries(NISTObjectIdentifiers.id_rsassa_pkcs1_v1_5_with_sha3_256, "SHA3-256", "RSA");
7271
addEntries(NISTObjectIdentifiers.id_rsassa_pkcs1_v1_5_with_sha3_384, "SHA3-384", "RSA");
7372
addEntries(NISTObjectIdentifiers.id_rsassa_pkcs1_v1_5_with_sha3_512, "SHA3-512", "RSA");
74-
addEntries(CMSObjectIdentifiers.id_RSASSA_PSS_SHAKE128, "SHAKE128", "RSAPSS");
75-
addEntries(CMSObjectIdentifiers.id_RSASSA_PSS_SHAKE256, "SHAKE256", "RSAPSS");
73+
addEntries(X509ObjectIdentifiers.id_rsassa_pss_shake128, "SHAKE128", "RSAPSS");
74+
addEntries(X509ObjectIdentifiers.id_rsassa_pss_shake256, "SHAKE256", "RSAPSS");
7675

7776
addEntries(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, "RIPEMD128", "RSA");
7877
addEntries(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, "RIPEMD160", "RSA");
@@ -83,8 +82,8 @@ public DefaultCMSSignatureAlgorithmNameGenerator()
8382
addEntries(X9ObjectIdentifiers.ecdsa_with_SHA256, "SHA256", "ECDSA");
8483
addEntries(X9ObjectIdentifiers.ecdsa_with_SHA384, "SHA384", "ECDSA");
8584
addEntries(X9ObjectIdentifiers.ecdsa_with_SHA512, "SHA512", "ECDSA");
86-
addEntries(CMSObjectIdentifiers.id_ecdsa_with_shake128, "SHAKE128", "ECDSA");
87-
addEntries(CMSObjectIdentifiers.id_ecdsa_with_shake256, "SHAKE256", "ECDSA");
85+
addEntries(X509ObjectIdentifiers.id_ecdsa_with_shake128, "SHAKE128", "ECDSA");
86+
addEntries(X509ObjectIdentifiers.id_ecdsa_with_shake256, "SHAKE256", "ECDSA");
8887
addEntries(X9ObjectIdentifiers.id_dsa_with_sha1, "SHA1", "DSA");
8988
addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_1, "SHA1", "ECDSA");
9089
addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224", "ECDSA");

‎pkix/src/main/java/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.bouncycastle.asn1.DERNull;
1111
import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
1212
import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
13-
import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
1413
import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
1514
import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
1615
import org.bouncycastle.asn1.edec.EdECObjectIdentifiers;
@@ -22,6 +21,7 @@
2221
import org.bouncycastle.asn1.rosstandart.RosstandartObjectIdentifiers;
2322
import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
2423
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
24+
import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
2525
import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
2626

2727
public class DefaultDigestAlgorithmIdentifierFinder
@@ -185,10 +185,10 @@ public class DefaultDigestAlgorithmIdentifierFinder
185185
// digestOids.put(GMObjectIdentifiers.sm2sign_with_sha512, NISTObjectIdentifiers.id_sha512);
186186
digestOids.put(GMObjectIdentifiers.sm2sign_with_sm3, GMObjectIdentifiers.sm3);
187187

188-
digestOids.put(CMSObjectIdentifiers.id_RSASSA_PSS_SHAKE128, NISTObjectIdentifiers.id_shake128);
189-
digestOids.put(CMSObjectIdentifiers.id_RSASSA_PSS_SHAKE256, NISTObjectIdentifiers.id_shake256);
190-
digestOids.put(CMSObjectIdentifiers.id_ecdsa_with_shake128, NISTObjectIdentifiers.id_shake128);
191-
digestOids.put(CMSObjectIdentifiers.id_ecdsa_with_shake256, NISTObjectIdentifiers.id_shake256);
188+
digestOids.put(X509ObjectIdentifiers.id_rsassa_pss_shake128, NISTObjectIdentifiers.id_shake128);
189+
digestOids.put(X509ObjectIdentifiers.id_rsassa_pss_shake256, NISTObjectIdentifiers.id_shake256);
190+
digestOids.put(X509ObjectIdentifiers.id_ecdsa_with_shake128, NISTObjectIdentifiers.id_shake128);
191+
digestOids.put(X509ObjectIdentifiers.id_ecdsa_with_shake256, NISTObjectIdentifiers.id_shake256);
192192

193193
digestNameToOids.put("SHA-1", OIWObjectIdentifiers.idSHA1);
194194
digestNameToOids.put("SHA-224", NISTObjectIdentifiers.id_sha224);

0 commit comments

Comments
 (0)