Skip to content

Commit 1e3cf00

Browse files
author
gefeili
committed
Remove duplicated SphincsPlust OIDs
1 parent 823cbd9 commit 1e3cf00

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

‎core/src/main/java/org/bouncycastle/asn1/bc/BCObjectIdentifiers.java‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -202,73 +202,61 @@ public interface BCObjectIdentifiers
202202

203203
ASN1ObjectIdentifier sphincsPlus_interop = new ASN1ObjectIdentifier("1.3.9999.6");
204204

205+
/** 1.3.9999.6.4.13 OQS_OID_SPHINCSSHA2128FSIMPLE */
205206
ASN1ObjectIdentifier sphincsPlus_sha2_128f = new ASN1ObjectIdentifier("1.3.9999.6.4.13");
207+
/** 1.3.9999.6.4.16 OQS_OID_SPHINCSSHA2128SSIMPLE */
206208
ASN1ObjectIdentifier sphincsPlus_sha2_128s = new ASN1ObjectIdentifier("1.3.9999.6.4.16");
209+
/** 1.3.9999.6.5.10 OQS_OID_SPHINCSSHA2192FSIMPLE */
207210
ASN1ObjectIdentifier sphincsPlus_sha2_192f = new ASN1ObjectIdentifier("1.3.9999.6.5.10");
211+
/** 1.3.9999.6.5.12 OQS_OID_SPHINCSSHA2192SSIMPLE */
208212
ASN1ObjectIdentifier sphincsPlus_sha2_192s = new ASN1ObjectIdentifier("1.3.9999.6.5.12");
213+
/** 1.3.9999.6.6.10 OQS_OID_SPHINCSSHA2256FSIMPLE */
209214
ASN1ObjectIdentifier sphincsPlus_sha2_256f = new ASN1ObjectIdentifier("1.3.9999.6.6.10");
215+
/** 1.3.9999.6.6.12 OQS_OID_SPHINCSSHA2256SSIMPLE */
210216
ASN1ObjectIdentifier sphincsPlus_sha2_256s = new ASN1ObjectIdentifier("1.3.9999.6.6.12");
211217

218+
/** 1.3.9999.6.7.13 OQS_OID_SPHINCSSHAKE128FSIMPLE */
212219
ASN1ObjectIdentifier sphincsPlus_shake_128f = new ASN1ObjectIdentifier("1.3.9999.6.7.13");
220+
/** 1.3.9999.6.7.16 OQS_OID_SPHINCSSHAKE128SSIMPLE */
213221
ASN1ObjectIdentifier sphincsPlus_shake_128s = new ASN1ObjectIdentifier("1.3.9999.6.7.16");
222+
/** 1.3.9999.6.8.10 OQS_OID_SPHINCSSHAKE192FSIMPLE */
214223
ASN1ObjectIdentifier sphincsPlus_shake_192f = new ASN1ObjectIdentifier("1.3.9999.6.8.10");
224+
/** 1.3.9999.6.8.12 OQS_OID_SPHINCSSHAKE192SSIMPLE */
215225
ASN1ObjectIdentifier sphincsPlus_shake_192s = new ASN1ObjectIdentifier("1.3.9999.6.8.12");
226+
/** 1.3.9999.6.9.10 OQS_OID_SPHINCSSHAKE256FSIMPLE */
216227
ASN1ObjectIdentifier sphincsPlus_shake_256f = new ASN1ObjectIdentifier("1.3.9999.6.9.10");
228+
/** 1.3.9999.6.9.12 OQS_OID_SPHINCSSHAKE256SSIMPLE */
217229
ASN1ObjectIdentifier sphincsPlus_shake_256s = new ASN1ObjectIdentifier("1.3.9999.6.9.12");
218-
/** 1.3.9999.6.4.13 OQS_OID_SPHINCSSHA2128FSIMPLE */
219-
ASN1ObjectIdentifier sphincs_sha2_128f_simple = new ASN1ObjectIdentifier("1.3.9999.6.4.13");
220230
/** 1.3.9999.6.4.14 OQS_OID_P256_SPHINCSSHA2128FSIMPLE */
221231
ASN1ObjectIdentifier p256_sphincs_sha2_128f_simple = new ASN1ObjectIdentifier("1.3.9999.6.4.14");
222232
/** 1.3.9999.6.4.15 OQS_OID_RSA3072_SPHINCSSHA2128FSIMPLE */
223233
ASN1ObjectIdentifier rsa_3072_sphincs_sha2_128f_simple = new ASN1ObjectIdentifier("1.3.9999.6.4.15");
224-
/** 1.3.9999.6.4.16 OQS_OID_SPHINCSSHA2128SSIMPLE */
225-
ASN1ObjectIdentifier sphincs_sha_2_128s_simple = new ASN1ObjectIdentifier("1.3.9999.6.4.16");
226234
/** 1.3.9999.6.4.17 OQS_OID_P256_SPHINCSSHA2128SSIMPLE */
227235
ASN1ObjectIdentifier p256_sphincs_sha2_128s_simple = new ASN1ObjectIdentifier("1.3.9999.6.4.17");
228236
/** 1.3.9999.6.4.18 OQS_OID_RSA3072_SPHINCSSHA2128SSIMPLE */
229237
ASN1ObjectIdentifier rsa_3072_sphincs_sha2_128s_simple = new ASN1ObjectIdentifier("1.3.9999.6.4.18");
230-
/** 1.3.9999.6.5.10 OQS_OID_SPHINCSSHA2192FSIMPLE */
231-
ASN1ObjectIdentifier sphincs_sha2_192f_simple = new ASN1ObjectIdentifier("1.3.9999.6.5.10");
232238
/** 1.3.9999.6.5.11 OQS_OID_P384_SPHINCSSHA2192FSIMPLE */
233239
ASN1ObjectIdentifier p384_sphincs_sha2_192f_simple = new ASN1ObjectIdentifier("1.3.9999.6.5.11");
234-
/** 1.3.9999.6.5.12 OQS_OID_SPHINCSSHA2192SSIMPLE */
235-
ASN1ObjectIdentifier sphincs_sha2_192s_simple = new ASN1ObjectIdentifier("1.3.9999.6.5.12");
236240
/** 1.3.9999.6.5.13 OQS_OID_P384_SPHINCSSHA2192SSIMPLE */
237241
ASN1ObjectIdentifier p384_sphincs_sha2192s_simple = new ASN1ObjectIdentifier("1.3.9999.6.5.13");
238-
/** 1.3.9999.6.6.10 OQS_OID_SPHINCSSHA2256FSIMPLE */
239-
ASN1ObjectIdentifier sphincs_sha2_256f_simple = new ASN1ObjectIdentifier("1.3.9999.6.6.10");
240242
/** 1.3.9999.6.6.11 OQS_OID_P521_SPHINCSSHA2256FSIMPLE */
241243
ASN1ObjectIdentifier p521_sphincs_sha2_256f_simple = new ASN1ObjectIdentifier("1.3.9999.6.6.11");
242-
/** 1.3.9999.6.6.12 OQS_OID_SPHINCSSHA2256SSIMPLE */
243-
ASN1ObjectIdentifier sphincs_sha2_256s_simple = new ASN1ObjectIdentifier("1.3.9999.6.6.12");
244244
/** 1.3.9999.6.6.13 OQS_OID_P521_SPHINCSSHA2256SSIMPLE */
245245
ASN1ObjectIdentifier p521_sphincs_sha2_256s_simple = new ASN1ObjectIdentifier("1.3.9999.6.6.13");
246-
/** 1.3.9999.6.7.13 OQS_OID_SPHINCSSHAKE128FSIMPLE */
247-
ASN1ObjectIdentifier sphincs_shake_128f_simple = new ASN1ObjectIdentifier("1.3.9999.6.7.13");
248246
/** 1.3.9999.6.7.14 OQS_OID_P256_SPHINCSSHAKE128FSIMPLE */
249247
ASN1ObjectIdentifier p256_sphincs_shake_128f_simple = new ASN1ObjectIdentifier("1.3.9999.6.7.14");
250248
/** 1.3.9999.6.7.15 OQS_OID_RSA3072_SPHINCSSHAKE128FSIMPLE */
251249
ASN1ObjectIdentifier rsa_3072_sphincs_shake_128f_simple = new ASN1ObjectIdentifier("1.3.9999.6.7.15");
252-
/** 1.3.9999.6.7.16 OQS_OID_SPHINCSSHAKE128SSIMPLE */
253-
ASN1ObjectIdentifier sphincs_shake_128s_simple = new ASN1ObjectIdentifier("1.3.9999.6.7.16");
254250
/** 1.3.9999.6.7.17 OQS_OID_P256_SPHINCSSHAKE128SSIMPLE */
255251
ASN1ObjectIdentifier p256_sphincs_shake_128s_simple = new ASN1ObjectIdentifier("1.3.9999.6.7.17");
256252
/** 1.3.9999.6.7.18 OQS_OID_RSA3072_SPHINCSSHAKE128SSIMPLE */
257253
ASN1ObjectIdentifier rsa_3072_sphincs_shake_128s_simple = new ASN1ObjectIdentifier("1.3.9999.6.7.18");
258-
/** 1.3.9999.6.8.10 OQS_OID_SPHINCSSHAKE192FSIMPLE */
259-
ASN1ObjectIdentifier sphincs_shake_192f_simple = new ASN1ObjectIdentifier("1.3.9999.6.8.10");
260254
/** 1.3.9999.6.8.11 OQS_OID_P384_SPHINCSSHAKE192FSIMPLE */
261255
ASN1ObjectIdentifier p384_sphincs_shake_192f_simple = new ASN1ObjectIdentifier("1.3.9999.6.8.11");
262-
/** 1.3.9999.6.8.12 OQS_OID_SPHINCSSHAKE192SSIMPLE */
263-
ASN1ObjectIdentifier sphincs_shake_192s_simple = new ASN1ObjectIdentifier("1.3.9999.6.8.12");
264256
/** 1.3.9999.6.8.13 OQS_OID_P384_SPHINCSSHAKE192SSIMPLE */
265257
ASN1ObjectIdentifier p384_sphincs_shake_192s_simple = new ASN1ObjectIdentifier("1.3.9999.6.8.13");
266-
/** 1.3.9999.6.9.10 OQS_OID_SPHINCSSHAKE256FSIMPLE */
267-
ASN1ObjectIdentifier sphincs_shake_256f_simple = new ASN1ObjectIdentifier("1.3.9999.6.9.10");
268258
/** 1.3.9999.6.9.11 OQS_OID_P521_SPHINCSSHAKE256FSIMPLE */
269259
ASN1ObjectIdentifier p521_sphincs_shake256f_simple = new ASN1ObjectIdentifier("1.3.9999.6.9.11");
270-
/** 1.3.9999.6.9.12 OQS_OID_SPHINCSSHAKE256SSIMPLE */
271-
ASN1ObjectIdentifier sphincs_shake_256s_simple = new ASN1ObjectIdentifier("1.3.9999.6.9.12");
272260
/** 1.3.9999.6.9.13 OQS_OID_P521_SPHINCSSHAKE256SSIMPLE */
273261
ASN1ObjectIdentifier p521_sphincs_shake256s_simple = new ASN1ObjectIdentifier("1.3.9999.6.9.13");
274262
/**

0 commit comments

Comments
 (0)