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

move of oiw, cryptlib and mozilla to util package · bcgit/bc-java@30a7eb7 · GitHub

Repository navigation

Commit 30a7eb7

Browse files
committed
move of oiw, cryptlib and mozilla to util package
1 parent c929cac commit 30a7eb7

68 files changed

Lines changed: 203 additions & 81 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.bouncycastle.asn1.DEROctetString;
1010
import org.bouncycastle.asn1.DERSequence;
1111
import org.bouncycastle.asn1.DERTaggedObject;
12-
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
1312
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
13+
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1414

1515
public class RSAESOAEPparams
1616
extends ASN1Object

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import org.bouncycastle.asn1.DERNull;
1212
import org.bouncycastle.asn1.DERSequence;
1313
import org.bouncycastle.asn1.DERTaggedObject;
14-
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
1514
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
15+
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1616

1717
public class RSASSAPSSparams
1818
extends ASN1Object

‎core/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
77
import org.bouncycastle.asn1.anssi.ANSSINamedCurves;
8-
import org.bouncycastle.asn1.cryptlib.CryptlibObjectIdentifiers;
98
import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
109
import org.bouncycastle.asn1.gm.GMNamedCurves;
1110
import org.bouncycastle.asn1.nist.NISTNamedCurves;
1211
import org.bouncycastle.asn1.sec.SECNamedCurves;
1312
import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
1413
import org.bouncycastle.crypto.ec.CustomNamedCurves;
14+
import org.bouncycastle.internal.asn1.cryptlib.CryptlibObjectIdentifiers;
1515

1616
/**
1717
* A general class that reads all X9.62 style EC curve tables.

‎core/src/main/java/org/bouncycastle/crypto/ec/CustomNamedCurves.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import java.util.Vector;
77

88
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
9-
import org.bouncycastle.asn1.cryptlib.CryptlibObjectIdentifiers;
109
import org.bouncycastle.asn1.gm.GMObjectIdentifiers;
1110
import org.bouncycastle.asn1.sec.SECObjectIdentifiers;
1211
import org.bouncycastle.asn1.x9.X9ECParameters;
1312
import org.bouncycastle.asn1.x9.X9ECParametersHolder;
1413
import org.bouncycastle.asn1.x9.X9ECPoint;
14+
import org.bouncycastle.internal.asn1.cryptlib.CryptlibObjectIdentifiers;
1515
import org.bouncycastle.math.ec.ECCurve;
1616
import org.bouncycastle.math.ec.WNafUtil;
1717
import org.bouncycastle.math.ec.custom.djb.Curve25519;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
66
import org.bouncycastle.asn1.DERNull;
77
import org.bouncycastle.asn1.DEROctetString;
8-
import org.bouncycastle.internal.asn1.cms.CCMParameters;
9-
import org.bouncycastle.internal.asn1.cms.GCMParameters;
108
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
119
import org.bouncycastle.asn1.misc.CAST5CBCParameters;
1210
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
1311
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
14-
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
1512
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1613
import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
1714
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
15+
import org.bouncycastle.internal.asn1.cms.CCMParameters;
16+
import org.bouncycastle.internal.asn1.cms.GCMParameters;
17+
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1818

1919
/**
2020
* Factory methods for common AlgorithmIdentifiers.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
1212
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
1313
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
14-
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
1514
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1615
import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
1716
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
@@ -38,6 +37,7 @@
3837
import org.bouncycastle.crypto.params.RC2Parameters;
3938
import org.bouncycastle.internal.asn1.cms.CCMParameters;
4039
import org.bouncycastle.internal.asn1.cms.GCMParameters;
40+
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
4141

4242
/**
4343
* Factory methods for creating Cipher objects and CipherOutputStreams.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
77
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
88
import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
9-
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
109
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
1110
import org.bouncycastle.crypto.CipherKeyGenerator;
1211
import org.bouncycastle.crypto.KeyGenerationParameters;
1312
import org.bouncycastle.crypto.generators.DESKeyGenerator;
1413
import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
14+
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
1515

1616
/**
1717
* Factory methods for generating secret key generators for symmetric ciphers.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
1616
import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
1717
import org.bouncycastle.asn1.edec.EdECObjectIdentifiers;
18-
import org.bouncycastle.asn1.oiw.ElGamalParameter;
19-
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
2018
import org.bouncycastle.asn1.pkcs.DHParameter;
2119
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
2220
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -47,6 +45,8 @@
4745
import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
4846
import org.bouncycastle.crypto.params.X25519PrivateKeyParameters;
4947
import org.bouncycastle.crypto.params.X448PrivateKeyParameters;
48+
import org.bouncycastle.internal.asn1.oiw.ElGamalParameter;
49+
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
5050
import org.bouncycastle.util.Arrays;
5151

5252
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
1919
import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
2020
import org.bouncycastle.asn1.edec.EdECObjectIdentifiers;
21-
import org.bouncycastle.asn1.oiw.ElGamalParameter;
22-
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
2321
import org.bouncycastle.asn1.pkcs.DHParameter;
2422
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
2523
import org.bouncycastle.asn1.pkcs.RSAPublicKey;
@@ -61,6 +59,8 @@
6159
import org.bouncycastle.crypto.params.RSAKeyParameters;
6260
import org.bouncycastle.crypto.params.X25519PublicKeyParameters;
6361
import org.bouncycastle.crypto.params.X448PublicKeyParameters;
62+
import org.bouncycastle.internal.asn1.oiw.ElGamalParameter;
63+
import org.bouncycastle.internal.asn1.oiw.OIWObjectIdentifiers;
6464
import org.bouncycastle.math.ec.ECCurve;
6565
import org.bouncycastle.math.ec.ECPoint;
6666
import org.bouncycastle.util.Arrays;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.bouncycastle.internal.asn1.cryptlib;
2+
3+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
4+
5+
public class CryptlibObjectIdentifiers
6+
{
7+
public static final ASN1ObjectIdentifier cryptlib = new ASN1ObjectIdentifier("1.3.6.1.4.1.3029");
8+
9+
public static final ASN1ObjectIdentifier ecc = cryptlib.branch("1").branch("5");
10+
11+
public static final ASN1ObjectIdentifier curvey25519 = ecc.branch("1");
12+
}

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL