From 2db28a5b63aadd34fb3ef350d69eb4db4e4580b4 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Fri, 17 Jul 2020 22:07:12 +0700 Subject: Straighten out ECGOST3410NamedCurves - deprecate/replace methods returning ECDomainParameters --- crypto/src/asn1/x9/ECNamedCurveTable.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'crypto/src/asn1/x9') diff --git a/crypto/src/asn1/x9/ECNamedCurveTable.cs b/crypto/src/asn1/x9/ECNamedCurveTable.cs index f91bded18..fcd2810e7 100644 --- a/crypto/src/asn1/x9/ECNamedCurveTable.cs +++ b/crypto/src/asn1/x9/ECNamedCurveTable.cs @@ -7,7 +7,6 @@ using Org.BouncyCastle.Asn1.GM; using Org.BouncyCastle.Asn1.Nist; using Org.BouncyCastle.Asn1.Sec; using Org.BouncyCastle.Asn1.TeleTrust; -using Org.BouncyCastle.Crypto.Parameters; using Org.BouncyCastle.Utilities; using Org.BouncyCastle.Utilities.Collections; @@ -46,7 +45,7 @@ namespace Org.BouncyCastle.Asn1.X9 } if (ecP == null) { - ecP = FromDomainParameters(ECGost3410NamedCurves.GetByName(name)); + ecP = ECGost3410NamedCurves.GetByNameX9(name); } if (ecP == null) { @@ -148,7 +147,7 @@ namespace Org.BouncyCastle.Asn1.X9 } if (ecP == null) { - ecP = FromDomainParameters(ECGost3410NamedCurves.GetByOid(oid)); + ecP = ECGost3410NamedCurves.GetByOidX9(oid); } if (ecP == null) { @@ -177,10 +176,5 @@ namespace Org.BouncyCastle.Asn1.X9 return v; } } - - private static X9ECParameters FromDomainParameters(ECDomainParameters dp) - { - return dp == null ? null : new X9ECParameters(dp.Curve, dp.G, dp.N, dp.H, dp.GetSeed()); - } } } -- cgit 1.4.1