diff options
| author | Peter Dettman <peter.dettman@gmail.com> | 2022-06-21 18:57:52 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@gmail.com> | 2022-06-21 18:57:52 +0700 |
| commit | 84a1abd2bb12af82623c136243240e52a88e0bf4 (patch) | |
| tree | 5a9828c8785a54c5b293ba484bdd0e2f2431600f /crypto/src/asn1/x9 | |
| parent | Update copyright (diff) | |
| download | BouncyCastle.NET-ed25519-84a1abd2bb12af82623c136243240e52a88e0bf4.tar.xz | |
ObsoleteAttribute cleanup
Diffstat (limited to 'crypto/src/asn1/x9')
| -rw-r--r-- | crypto/src/asn1/x9/X962Parameters.cs | 4 | ||||
| -rw-r--r-- | crypto/src/asn1/x9/X9Curve.cs | 8 | ||||
| -rw-r--r-- | crypto/src/asn1/x9/X9FieldElement.cs | 19 | ||||
| -rw-r--r-- | crypto/src/asn1/x9/X9ObjectIdentifiers.cs | 8 |
4 files changed, 2 insertions, 37 deletions
diff --git a/crypto/src/asn1/x9/X962Parameters.cs b/crypto/src/asn1/x9/X962Parameters.cs index 5bdabc647..b863f4bfd 100644 --- a/crypto/src/asn1/x9/X962Parameters.cs +++ b/crypto/src/asn1/x9/X962Parameters.cs @@ -55,9 +55,7 @@ namespace Org.BouncyCastle.Asn1.X9 this._params = obj; } - [Obsolete("Use 'GetInstance' instead")] - public X962Parameters( - Asn1Object obj) + private X962Parameters(Asn1Object obj) { this._params = obj; } diff --git a/crypto/src/asn1/x9/X9Curve.cs b/crypto/src/asn1/x9/X9Curve.cs index 0be9bf935..88198335f 100644 --- a/crypto/src/asn1/x9/X9Curve.cs +++ b/crypto/src/asn1/x9/X9Curve.cs @@ -47,14 +47,6 @@ namespace Org.BouncyCastle.Asn1.X9 } } - [Obsolete("Use constructor including order/cofactor")] - public X9Curve( - X9FieldID fieldID, - Asn1Sequence seq) - : this(fieldID, null, null, seq) - { - } - public X9Curve( X9FieldID fieldID, BigInteger order, diff --git a/crypto/src/asn1/x9/X9FieldElement.cs b/crypto/src/asn1/x9/X9FieldElement.cs index 222b4cfc8..1143bf757 100644 --- a/crypto/src/asn1/x9/X9FieldElement.cs +++ b/crypto/src/asn1/x9/X9FieldElement.cs @@ -19,25 +19,6 @@ namespace Org.BouncyCastle.Asn1.X9 this.f = f; } - [Obsolete("Will be removed")] - public X9FieldElement( - BigInteger p, - Asn1OctetString s) - : this(new FpFieldElement(p, new BigInteger(1, s.GetOctets()))) - { - } - - [Obsolete("Will be removed")] - public X9FieldElement( - int m, - int k1, - int k2, - int k3, - Asn1OctetString s) - : this(new F2mFieldElement(m, k1, k2, k3, new BigInteger(1, s.GetOctets()))) - { - } - public ECFieldElement Value { get { return f; } diff --git a/crypto/src/asn1/x9/X9ObjectIdentifiers.cs b/crypto/src/asn1/x9/X9ObjectIdentifiers.cs index 9d7ecae6e..11b94e8d6 100644 --- a/crypto/src/asn1/x9/X9ObjectIdentifiers.cs +++ b/crypto/src/asn1/x9/X9ObjectIdentifiers.cs @@ -11,9 +11,7 @@ namespace Org.BouncyCastle.Asn1.X9 // us(840) ansi-x962(10045) } // - internal const string AnsiX962 = "1.2.840.10045"; - - public static readonly DerObjectIdentifier ansi_X9_62 = new DerObjectIdentifier(AnsiX962); + public static readonly DerObjectIdentifier ansi_X9_62 = new DerObjectIdentifier("1.2.840.10045"); public static readonly DerObjectIdentifier IdFieldType = ansi_X9_62.Branch("1"); @@ -24,14 +22,10 @@ namespace Org.BouncyCastle.Asn1.X9 public static readonly DerObjectIdentifier TPBasis = CharacteristicTwoField.Branch("3.2"); public static readonly DerObjectIdentifier PPBasis = CharacteristicTwoField.Branch("3.3"); - [Obsolete("Use 'id_ecSigType' instead")] - public const string IdECSigType = AnsiX962 + ".4"; public static readonly DerObjectIdentifier id_ecSigType = ansi_X9_62.Branch("4"); public static readonly DerObjectIdentifier ECDsaWithSha1 = id_ecSigType.Branch("1"); - [Obsolete("Use 'id_publicKeyType' instead")] - public const string IdPublicKeyType = AnsiX962 + ".2"; public static readonly DerObjectIdentifier id_publicKeyType = ansi_X9_62.Branch("2"); public static readonly DerObjectIdentifier IdECPublicKey = id_publicKeyType.Branch("1"); |