Skip to content

Commit e05e4b7

Browse files
dghgitdghgit
committed
move of ASN.1 isara, iso, kisa, and microsoft to util package
1 parent c7a425c commit e05e4b7

File tree

31 files changed

+150
-35
lines changed

31 files changed

+150
-35
lines changed

‎core/src/main/java/org/bouncycastle/crypto/util/AlgorithmIdentifierFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
66
import org.bouncycastle.asn1.DERNull;
77
import org.bouncycastle.asn1.DEROctetString;
8-
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
98
import org.bouncycastle.asn1.misc.CAST5CBCParameters;
109
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
1110
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1211
import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
1312
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
1413
import org.bouncycastle.internal.asn1.cms.CCMParameters;
1514
import org.bouncycastle.internal.asn1.cms.GCMParameters;
15+
import org.bouncycastle.internal.asn1.kisa.KISAObjectIdentifiers;
1616
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
1717
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1818

‎core/src/main/java/org/bouncycastle/crypto/util/CipherFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
77
import org.bouncycastle.asn1.ASN1OctetString;
88
import org.bouncycastle.asn1.ASN1Primitive;
9-
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
109
import org.bouncycastle.asn1.misc.CAST5CBCParameters;
1110
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
1211
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
@@ -36,6 +35,7 @@
3635
import org.bouncycastle.crypto.params.RC2Parameters;
3736
import org.bouncycastle.internal.asn1.cms.CCMParameters;
3837
import org.bouncycastle.internal.asn1.cms.GCMParameters;
38+
import org.bouncycastle.internal.asn1.kisa.KISAObjectIdentifiers;
3939
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
4040
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
4141

‎core/src/main/java/org/bouncycastle/crypto/util/CipherKeyGeneratorFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import java.security.SecureRandom;
44

55
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
6-
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
76
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
87
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
98
import org.bouncycastle.crypto.CipherKeyGenerator;
109
import org.bouncycastle.crypto.KeyGenerationParameters;
1110
import org.bouncycastle.crypto.generators.DESKeyGenerator;
1211
import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
12+
import org.bouncycastle.internal.asn1.kisa.KISAObjectIdentifiers;
1313
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
1414
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1515

‎core/src/main/java/org/bouncycastle/internal/asn1/isara/IsaraObjectIdentifiers.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.bouncycastle.internal.asn1.isara;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
public interface IsaraObjectIdentifiers
6+
{
7+
/*
8+
id-alg-xmss OBJECT IDENTIFIER ::= { itu-t(0)
9+
identified-organization(4) etsi(0) reserved(127)
10+
etsi-identified-organization(0) isara(15) algorithms(1)
11+
asymmetric(1) xmss(13) 0 }
12+
*/
13+
static ASN1ObjectIdentifier id_alg_xmss = new ASN1ObjectIdentifier("0.4.0.127.0.15.1.1.13.0");
14+
15+
/*
16+
id-alg-xmssmt OBJECT IDENTIFIER ::= { itu-t(0)
17+
identified-organization(4) etsi(0) reserved(127)
18+
etsi-identified-organization(0) isara(15) algorithms(1)
19+
asymmetric(1) xmssmt(14) 0 }
20+
*/
21+
static ASN1ObjectIdentifier id_alg_xmssmt = new ASN1ObjectIdentifier("0.4.0.127.0.15.1.1.14.0");
22+
}

‎core/src/main/java/org/bouncycastle/internal/asn1/iso/ISOIECObjectIdentifiers.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package org.bouncycastle.internal.asn1.iso;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
/**
6+
* OIDS from ISO/IEC 10118-3:2004
7+
*/
8+
public interface ISOIECObjectIdentifiers
9+
{
10+
ASN1ObjectIdentifier iso_encryption_algorithms = new ASN1ObjectIdentifier("1.0.10118");
11+
12+
ASN1ObjectIdentifier hash_algorithms = iso_encryption_algorithms.branch("3.0");
13+
14+
ASN1ObjectIdentifier ripemd160 = hash_algorithms.branch("49");
15+
ASN1ObjectIdentifier ripemd128 = hash_algorithms.branch("50");
16+
ASN1ObjectIdentifier whirlpool = hash_algorithms.branch("55");
17+
18+
19+
20+
/**
21+
* -- ISO/IEC 18033-2 arc
22+
23+
is18033-2 OID ::= { iso(1) standard(0) is18033(18033) part2(2) }
24+
*/
25+
ASN1ObjectIdentifier is18033_2 = new ASN1ObjectIdentifier("1.0.18033.2");
26+
27+
ASN1ObjectIdentifier id_ac_generic_hybrid = is18033_2.branch("1.2");
28+
29+
/**
30+
id-kem-rsa OID ::= {
31+
is18033-2 key-encapsulation-mechanism(2) rsa(4)
32+
}
33+
*/
34+
ASN1ObjectIdentifier id_kem_rsa = is18033_2.branch("2.4");
35+
}

‎core/src/main/java/org/bouncycastle/internal/asn1/kisa/KISAObjectIdentifiers.java

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.bouncycastle.internal.asn1.kisa;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
/**
6+
* Korea Information Security Agency (KISA)
7+
* ({iso(1) member-body(2) kr(410) kisa(200004)})
8+
* <p>
9+
* See <a href="https://tools.ietf.org/html/rfc4010">RFC 4010</a>
10+
* Use of the SEED Encryption Algorithm
11+
* in Cryptographic Message Syntax (CMS),
12+
* and <a href="https://tools.ietf.org/html/rfc4269">RFC 4269</a>
13+
* The SEED Encryption Algorithm
14+
*/
15+
public interface KISAObjectIdentifiers
16+
{
17+
/** RFC 4010, 4269: id-seedCBC; OID 1.2.410.200004.1.4 */
18+
static final ASN1ObjectIdentifier id_seedCBC = new ASN1ObjectIdentifier("1.2.410.200004.1.4");
19+
20+
/** RFC 4269: id-seedMAC; OID 1.2.410.200004.1.7 */
21+
static final ASN1ObjectIdentifier id_seedMAC = new ASN1ObjectIdentifier("1.2.410.200004.1.7");
22+
23+
/** RFC 4269: pbeWithSHA1AndSEED-CBC; OID 1.2.410.200004.1.15 */
24+
static final ASN1ObjectIdentifier pbeWithSHA1AndSEED_CBC = new ASN1ObjectIdentifier("1.2.410.200004.1.15");
25+
26+
/** RFC 4010: id-npki-app-cmsSeed-wrap; OID 1.2.410.200004.7.1.1.1 */
27+
static final ASN1ObjectIdentifier id_npki_app_cmsSeed_wrap = new ASN1ObjectIdentifier("1.2.410.200004.7.1.1.1");
28+
29+
/** RFC 4010: SeedEncryptionAlgorithmInCMS; OID 1.2.840.113549.1.9.16.0.24 */
30+
static final ASN1ObjectIdentifier id_mod_cms_seed = new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.0.24");
31+
}

‎core/src/main/java/org/bouncycastle/internal/asn1/microsoft/MicrosoftObjectIdentifiers.java

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package org.bouncycastle.internal.asn1.microsoft;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
/**
6+
* Microsoft
7+
* <p>
8+
* Object identifier base:
9+
* <pre>
10+
* iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) microsoft(311)
11+
* </pre>
12+
* 1.3.6.1.4.1.311
13+
*/
14+
public interface MicrosoftObjectIdentifiers
15+
{
16+
/** Base OID: 1.3.6.1.4.1.311 */
17+
static final ASN1ObjectIdentifier microsoft = new ASN1ObjectIdentifier("1.3.6.1.4.1.311");
18+
/** OID: 1.3.6.1.4.1.311.20.2 */
19+
static final ASN1ObjectIdentifier microsoftCertTemplateV1 = microsoft.branch("20.2");
20+
/** OID: 1.3.6.1.4.1.311.21.1 */
21+
static final ASN1ObjectIdentifier microsoftCaVersion = microsoft.branch("21.1");
22+
/** OID: 1.3.6.1.4.1.311.21.2 */
23+
static final ASN1ObjectIdentifier microsoftPrevCaCertHash = microsoft.branch("21.2");
24+
/** OID: 1.3.6.1.4.1.311.21.4 */
25+
static final ASN1ObjectIdentifier microsoftCrlNextPublish = microsoft.branch("21.4");
26+
/** OID: 1.3.6.1.4.1.311.21.7 */
27+
static final ASN1ObjectIdentifier microsoftCertTemplateV2 = microsoft.branch("21.7");
28+
/** OID: 1.3.6.1.4.1.311.21.10 */
29+
static final ASN1ObjectIdentifier microsoftAppPolicies = microsoft.branch("21.10");
30+
}

‎core/src/main/java/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import org.bouncycastle.asn1.ASN1Primitive;
1313
import org.bouncycastle.asn1.ASN1Sequence;
1414
import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
15-
import org.bouncycastle.asn1.isara.IsaraObjectIdentifiers;
1615
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1716
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
1817
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
1918
import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
19+
import org.bouncycastle.internal.asn1.isara.IsaraObjectIdentifiers;
2020
import org.bouncycastle.pqc.asn1.CMCEPublicKey;
2121
import org.bouncycastle.pqc.asn1.KyberPublicKey;
2222
import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;

‎core/src/main/java/org/bouncycastle/pqc/crypto/util/SubjectPublicKeyInfoFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import org.bouncycastle.asn1.DEROctetString;
66
import org.bouncycastle.asn1.DERSequence;
7-
import org.bouncycastle.asn1.isara.IsaraObjectIdentifiers;
87
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
98
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
109
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
1110
import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
11+
import org.bouncycastle.internal.asn1.isara.IsaraObjectIdentifiers;
1212
import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;
1313
import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
1414
import org.bouncycastle.pqc.asn1.SPHINCS256KeyParams;

‎core/src/main/jdk1.1/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.bouncycastle.asn1.ASN1Primitive;
1313
import org.bouncycastle.asn1.ASN1Sequence;
1414
import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
15-
import org.bouncycastle.asn1.isara.IsaraObjectIdentifiers;
15+
import org.bouncycastle.internal.asn1.isara.IsaraObjectIdentifiers;
1616
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1717
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
1818
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;

0 commit comments

Comments
 (0)