Skip to content

Commit c7a425c

Browse files
dghgitdghgit
committed
move of ASN.1 gnu, ntt and iana to util package
1 parent 30a7eb7 commit c7a425c

File tree

25 files changed

+224
-30
lines changed

25 files changed

+224
-30
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
99
import org.bouncycastle.asn1.misc.CAST5CBCParameters;
1010
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
11-
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
1211
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1312
import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
1413
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
1514
import org.bouncycastle.internal.asn1.cms.CCMParameters;
1615
import org.bouncycastle.internal.asn1.cms.GCMParameters;
16+
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
1717
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1818

1919
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.bouncycastle.asn1.misc.CAST5CBCParameters;
1111
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
1212
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
13-
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
1413
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1514
import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
1615
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
@@ -37,6 +36,7 @@
3736
import org.bouncycastle.crypto.params.RC2Parameters;
3837
import org.bouncycastle.internal.asn1.cms.CCMParameters;
3938
import org.bouncycastle.internal.asn1.cms.GCMParameters;
39+
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
4040
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
4141

4242
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
66
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
77
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
8-
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
98
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
109
import org.bouncycastle.crypto.CipherKeyGenerator;
1110
import org.bouncycastle.crypto.KeyGenerationParameters;
1211
import org.bouncycastle.crypto.generators.DESKeyGenerator;
1312
import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
13+
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
1414
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1515

1616
/**

‎core/src/main/java/org/bouncycastle/internal/asn1/gnu/GNUObjectIdentifiers.java

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
package org.bouncycastle.internal.asn1.gnu;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
/**
6+
* GNU project OID collection<p>
7+
* { iso(1) identifier-organization(3) dod(6) internet(1) private(4) } == IETF defined things
8+
*/
9+
public interface GNUObjectIdentifiers
10+
{
11+
/**
12+
* 1.3.6.1.4.1.11591.1 -- used by GNU Radius
13+
*/
14+
ASN1ObjectIdentifier GNU = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.1"); // GNU Radius
15+
/**
16+
* 1.3.6.1.4.1.11591.2 -- used by GNU PG
17+
*/
18+
ASN1ObjectIdentifier GnuPG = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.2"); // GnuPG (Ägypten)
19+
/**
20+
* 1.3.6.1.4.1.11591.2.1 -- notation
21+
*/
22+
ASN1ObjectIdentifier notation = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.2.1"); // notation
23+
/**
24+
* 1.3.6.1.4.1.11591.2.1.1 -- pkaAddress
25+
*/
26+
ASN1ObjectIdentifier pkaAddress = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.2.1.1"); // pkaAddress
27+
/**
28+
* 1.3.6.1.4.1.11591.3 -- GNU Radar
29+
*/
30+
ASN1ObjectIdentifier GnuRadar = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.3"); // GNU Radar
31+
/**
32+
* 1.3.6.1.4.1.11591.12 -- digestAlgorithm
33+
*/
34+
ASN1ObjectIdentifier digestAlgorithm = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.12"); // digestAlgorithm
35+
/**
36+
* 1.3.6.1.4.1.11591.12.2 -- TIGER/192
37+
*/
38+
ASN1ObjectIdentifier Tiger_192 = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.12.2"); // TIGER/192
39+
/**
40+
* 1.3.6.1.4.1.11591.13 -- encryptionAlgorithm
41+
*/
42+
ASN1ObjectIdentifier encryptionAlgorithm = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13"); // encryptionAlgorithm
43+
/**
44+
* 1.3.6.1.4.1.11591.13.2 -- Serpent
45+
*/
46+
ASN1ObjectIdentifier Serpent = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2"); // Serpent
47+
/**
48+
* 1.3.6.1.4.1.11591.13.2.1 -- Serpent-128-ECB
49+
*/
50+
ASN1ObjectIdentifier Serpent_128_ECB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.1"); // Serpent-128-ECB
51+
/**
52+
* 1.3.6.1.4.1.11591.13.2.2 -- Serpent-128-CBC
53+
*/
54+
ASN1ObjectIdentifier Serpent_128_CBC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.2"); // Serpent-128-CBC
55+
/**
56+
* 1.3.6.1.4.1.11591.13.2.3 -- Serpent-128-OFB
57+
*/
58+
ASN1ObjectIdentifier Serpent_128_OFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.3"); // Serpent-128-OFB
59+
/**
60+
* 1.3.6.1.4.1.11591.13.2.4 -- Serpent-128-CFB
61+
*/
62+
ASN1ObjectIdentifier Serpent_128_CFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.4"); // Serpent-128-CFB
63+
/**
64+
* 1.3.6.1.4.1.11591.13.2.21 -- Serpent-192-ECB
65+
*/
66+
ASN1ObjectIdentifier Serpent_192_ECB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.21"); // Serpent-192-ECB
67+
/**
68+
* 1.3.6.1.4.1.11591.13.2.22 -- Serpent-192-CCB
69+
*/
70+
ASN1ObjectIdentifier Serpent_192_CBC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.22"); // Serpent-192-CBC
71+
/**
72+
* 1.3.6.1.4.1.11591.13.2.23 -- Serpent-192-OFB
73+
*/
74+
ASN1ObjectIdentifier Serpent_192_OFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.23"); // Serpent-192-OFB
75+
/**
76+
* 1.3.6.1.4.1.11591.13.2.24 -- Serpent-192-CFB
77+
*/
78+
ASN1ObjectIdentifier Serpent_192_CFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.24"); // Serpent-192-CFB
79+
/**
80+
* 1.3.6.1.4.1.11591.13.2.41 -- Serpent-256-ECB
81+
*/
82+
ASN1ObjectIdentifier Serpent_256_ECB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.41"); // Serpent-256-ECB
83+
/**
84+
* 1.3.6.1.4.1.11591.13.2.42 -- Serpent-256-CBC
85+
*/
86+
ASN1ObjectIdentifier Serpent_256_CBC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.42"); // Serpent-256-CBC
87+
/**
88+
* 1.3.6.1.4.1.11591.13.2.43 -- Serpent-256-OFB
89+
*/
90+
ASN1ObjectIdentifier Serpent_256_OFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.43"); // Serpent-256-OFB
91+
/**
92+
* 1.3.6.1.4.1.11591.13.2.44 -- Serpent-256-CFB
93+
*/
94+
ASN1ObjectIdentifier Serpent_256_CFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.44"); // Serpent-256-CFB
95+
96+
/**
97+
* 1.3.6.1.4.1.11591.14 -- CRC algorithms
98+
*/
99+
ASN1ObjectIdentifier CRC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.14"); // CRC algorithms
100+
/**
101+
* 1.3.6.1.4.1.11591.14,1 -- CRC32
102+
*/
103+
ASN1ObjectIdentifier CRC32 = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.14.1"); // CRC 32
104+
105+
/**
106+
* 1.3.6.1.4.1.11591.15 - ellipticCurve
107+
*/
108+
ASN1ObjectIdentifier ellipticCurve = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.15");
109+
110+
ASN1ObjectIdentifier Ed25519 = ellipticCurve.branch("1");
111+
}

‎core/src/main/java/org/bouncycastle/internal/asn1/iana/IANAObjectIdentifiers.java

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package org.bouncycastle.internal.asn1.iana;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
/**
6+
* IANA:
7+
* { iso(1) identifier-organization(3) dod(6) internet(1) } == IETF defined things
8+
*/
9+
public interface IANAObjectIdentifiers
10+
{
11+
12+
/** { iso(1) identifier-organization(3) dod(6) internet(1) } == IETF defined things */
13+
static final ASN1ObjectIdentifier internet = new ASN1ObjectIdentifier("1.3.6.1");
14+
/** 1.3.6.1.1: Internet directory: X.500 */
15+
static final ASN1ObjectIdentifier directory = internet.branch("1");
16+
/** 1.3.6.1.2: Internet management */
17+
static final ASN1ObjectIdentifier mgmt = internet.branch("2");
18+
/** 1.3.6.1.3: */
19+
static final ASN1ObjectIdentifier experimental = internet.branch("3");
20+
/** 1.3.6.1.4: */
21+
static final ASN1ObjectIdentifier _private = internet.branch("4");
22+
/** 1.3.6.1.5: Security services */
23+
static final ASN1ObjectIdentifier security = internet.branch("5");
24+
/** 1.3.6.1.6: SNMPv2 -- never really used */
25+
static final ASN1ObjectIdentifier SNMPv2 = internet.branch("6");
26+
/** 1.3.6.1.7: mail -- never really used */
27+
static final ASN1ObjectIdentifier mail = internet.branch("7");
28+
29+
30+
// id-SHA1 OBJECT IDENTIFIER ::=
31+
// {iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) ipsec(8) isakmpOakley(1)}
32+
//
33+
34+
35+
/** IANA security mechanisms; 1.3.6.1.5.5 */
36+
static final ASN1ObjectIdentifier security_mechanisms = security.branch("5");
37+
/** IANA security nametypes; 1.3.6.1.5.6 */
38+
static final ASN1ObjectIdentifier security_nametypes = security.branch("6");
39+
40+
/** PKIX base OID: 1.3.6.1.5.6.6 */
41+
static final ASN1ObjectIdentifier pkix = security_mechanisms.branch("6");
42+
43+
44+
/** IPSEC base OID: 1.3.6.1.5.5.8 */
45+
static final ASN1ObjectIdentifier ipsec = security_mechanisms.branch("8");
46+
/** IPSEC ISAKMP-Oakley OID: 1.3.6.1.5.5.8.1 */
47+
static final ASN1ObjectIdentifier isakmpOakley = ipsec.branch("1");
48+
49+
/** IPSEC ISAKMP-Oakley hmacMD5 OID: 1.3.6.1.5.5.8.1.1 */
50+
static final ASN1ObjectIdentifier hmacMD5 = isakmpOakley.branch("1");
51+
/** IPSEC ISAKMP-Oakley hmacSHA1 OID: 1.3.6.1.5.5.8.1.2 */
52+
static final ASN1ObjectIdentifier hmacSHA1 = isakmpOakley.branch("2");
53+
54+
/** IPSEC ISAKMP-Oakley hmacTIGER OID: 1.3.6.1.5.5.8.1.3 */
55+
static final ASN1ObjectIdentifier hmacTIGER = isakmpOakley.branch("3");
56+
57+
/** IPSEC ISAKMP-Oakley hmacRIPEMD160 OID: 1.3.6.1.5.5.8.1.4 */
58+
static final ASN1ObjectIdentifier hmacRIPEMD160 = isakmpOakley.branch("4");
59+
60+
}

‎core/src/main/java/org/bouncycastle/internal/asn1/ntt/NTTObjectIdentifiers.java

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.bouncycastle.internal.asn1.ntt;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
/**
6+
* From <a href="https://tools.ietf.org/html/rfc3657">RFC 3657</a>
7+
* Use of the Camellia Encryption Algorithm
8+
* in Cryptographic Message Syntax (CMS)
9+
*/
10+
public interface NTTObjectIdentifiers
11+
{
12+
/** id-camellia128-cbc; OID 1.2.392.200011.61.1.1.1.2 */
13+
static final ASN1ObjectIdentifier id_camellia128_cbc = new ASN1ObjectIdentifier("1.2.392.200011.61.1.1.1.2");
14+
/** id-camellia192-cbc; OID 1.2.392.200011.61.1.1.1.3 */
15+
static final ASN1ObjectIdentifier id_camellia192_cbc = new ASN1ObjectIdentifier("1.2.392.200011.61.1.1.1.3");
16+
/** id-camellia256-cbc; OID 1.2.392.200011.61.1.1.1.4 */
17+
static final ASN1ObjectIdentifier id_camellia256_cbc = new ASN1ObjectIdentifier("1.2.392.200011.61.1.1.1.4");
18+
19+
/** id-camellia128-wrap; OID 1.2.392.200011.61.1.1.3.2 */
20+
static final ASN1ObjectIdentifier id_camellia128_wrap = new ASN1ObjectIdentifier("1.2.392.200011.61.1.1.3.2");
21+
/** id-camellia192-wrap; OID 1.2.392.200011.61.1.1.3.3 */
22+
static final ASN1ObjectIdentifier id_camellia192_wrap = new ASN1ObjectIdentifier("1.2.392.200011.61.1.1.3.3");
23+
/** id-camellia256-wrap; OID 1.2.392.200011.61.1.1.3.4 */
24+
static final ASN1ObjectIdentifier id_camellia256_wrap = new ASN1ObjectIdentifier("1.2.392.200011.61.1.1.3.4");
25+
}

‎prov/src/main/ext-jdk1.9/module-info.java

-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515
exports org.bouncycastle.asn1.cryptopro;
1616
exports org.bouncycastle.asn1.edec;
1717
exports org.bouncycastle.asn1.gm;
18-
exports org.bouncycastle.asn1.gnu;
19-
exports org.bouncycastle.asn1.iana;
2018
exports org.bouncycastle.asn1.isara;
2119
exports org.bouncycastle.asn1.iso;
2220
exports org.bouncycastle.asn1.kisa;
2321
exports org.bouncycastle.asn1.microsoft;
2422
exports org.bouncycastle.asn1.misc;
2523
exports org.bouncycastle.asn1.nist;
2624
exports org.bouncycastle.asn1.nsri;
27-
exports org.bouncycastle.asn1.ntt;
2825
exports org.bouncycastle.asn1.ocsp;
2926
exports org.bouncycastle.asn1.pkcs;
3027
exports org.bouncycastle.asn1.rosstandart;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseAgreementSpi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717

1818
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
1919
import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
20-
import org.bouncycastle.asn1.gnu.GNUObjectIdentifiers;
2120
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
2221
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
2322
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
24-
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
2523
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
2624
import org.bouncycastle.crypto.DerivationFunction;
2725
import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
@@ -30,6 +28,8 @@
3028
import org.bouncycastle.crypto.params.DESParameters;
3129
import org.bouncycastle.crypto.params.HKDFParameters;
3230
import org.bouncycastle.crypto.params.KDFParameters;
31+
import org.bouncycastle.internal.asn1.gnu.GNUObjectIdentifiers;
32+
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
3333
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
3434
import org.bouncycastle.jcajce.spec.HybridValueParameterSpec;
3535
import org.bouncycastle.util.Arrays;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD5.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.bouncycastle.jcajce.provider.digest;
22

3-
import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
43
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
54
import org.bouncycastle.crypto.CipherKeyGenerator;
65
import org.bouncycastle.crypto.digests.MD5Digest;
76
import org.bouncycastle.crypto.macs.HMac;
7+
import org.bouncycastle.internal.asn1.iana.IANAObjectIdentifiers;
88
import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
99
import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
1010
import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD160.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.bouncycastle.jcajce.provider.digest;
22

3-
import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
43
import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
54
import org.bouncycastle.crypto.CipherKeyGenerator;
65
import org.bouncycastle.crypto.digests.RIPEMD160Digest;
76
import org.bouncycastle.crypto.macs.HMac;
7+
import org.bouncycastle.internal.asn1.iana.IANAObjectIdentifiers;
88
import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
99
import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
1010
import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.bouncycastle.jcajce.provider.digest;
22

3-
import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
43
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
54
import org.bouncycastle.crypto.CipherKeyGenerator;
65
import org.bouncycastle.crypto.digests.SHA1Digest;
76
import org.bouncycastle.crypto.macs.HMac;
7+
import org.bouncycastle.internal.asn1.iana.IANAObjectIdentifiers;
88
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
99
import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
1010
import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Tiger.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.bouncycastle.jcajce.provider.digest;
22

3-
import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
43
import org.bouncycastle.crypto.CipherKeyGenerator;
54
import org.bouncycastle.crypto.digests.TigerDigest;
65
import org.bouncycastle.crypto.macs.HMac;
6+
import org.bouncycastle.internal.asn1.iana.IANAObjectIdentifiers;
77
import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
88
import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
99
import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bcfks/BcFKSKeyStoreSpi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import org.bouncycastle.asn1.misc.ScryptParams;
6767
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
6868
import org.bouncycastle.asn1.nsri.NSRIObjectIdentifiers;
69-
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
7069
import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
7170
import org.bouncycastle.asn1.pkcs.EncryptionScheme;
7271
import org.bouncycastle.asn1.pkcs.KeyDerivationFunc;
@@ -88,6 +87,7 @@
8887
import org.bouncycastle.crypto.util.PBKDFConfig;
8988
import org.bouncycastle.crypto.util.ScryptConfig;
9089
import org.bouncycastle.internal.asn1.cms.CCMParameters;
90+
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
9191
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
9292
import org.bouncycastle.jcajce.BCFKSLoadStoreParameter;
9393
import org.bouncycastle.jcajce.BCFKSStoreParameter;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
6969
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
7070
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
71-
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
7271
import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
7372
import org.bouncycastle.asn1.pkcs.CertBag;
7473
import org.bouncycastle.asn1.pkcs.ContentInfo;
@@ -95,6 +94,7 @@
9594
import org.bouncycastle.crypto.CryptoServicesRegistrar;
9695
import org.bouncycastle.crypto.Digest;
9796
import org.bouncycastle.crypto.util.DigestFactory;
97+
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
9898
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
9999
import org.bouncycastle.jcajce.BCLoadStoreParameter;
100100
import org.bouncycastle.jcajce.PKCS12Key;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Camellia.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import javax.crypto.spec.IvParameterSpec;
99

10-
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
1110
import org.bouncycastle.crypto.BlockCipher;
1211
import org.bouncycastle.crypto.CipherKeyGenerator;
1312
import org.bouncycastle.crypto.CryptoServicesRegistrar;
@@ -18,6 +17,7 @@
1817
import org.bouncycastle.crypto.macs.GMac;
1918
import org.bouncycastle.crypto.modes.CBCBlockCipher;
2019
import org.bouncycastle.crypto.modes.GCMBlockCipher;
20+
import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
2121
import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
2222
import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
2323
import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;

‎prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Serpent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.bouncycastle.jcajce.provider.symmetric;
22

3-
import org.bouncycastle.asn1.gnu.GNUObjectIdentifiers;
43
import org.bouncycastle.crypto.BlockCipher;
54
import org.bouncycastle.crypto.BufferedBlockCipher;
65
import org.bouncycastle.crypto.CipherKeyGenerator;
@@ -12,6 +11,7 @@
1211
import org.bouncycastle.crypto.modes.CFBBlockCipher;
1312
import org.bouncycastle.crypto.modes.GCMBlockCipher;
1413
import org.bouncycastle.crypto.modes.OFBBlockCipher;
14+
import org.bouncycastle.internal.asn1.gnu.GNUObjectIdentifiers;
1515
import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
1616
import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
1717
import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;

0 commit comments

Comments
 (0)