From b3a8c7160ce31e8b4ef03dc862f1dc7cfa0dd480 Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Thu, 3 Feb 2022 15:19:53 +0700
Subject: Improve curve registry laziness

---
 crypto/src/openssl/PEMReader.cs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'crypto/src/openssl')

diff --git a/crypto/src/openssl/PEMReader.cs b/crypto/src/openssl/PEMReader.cs
index 9a5f99b1a..65d3f5ad6 100644
--- a/crypto/src/openssl/PEMReader.cs
+++ b/crypto/src/openssl/PEMReader.cs
@@ -379,22 +379,12 @@ namespace Org.BouncyCastle.OpenSsl
 //			return GetCurveParameters(oid.Id);
 //		}
 
-        //private static ECDomainParameters GetCurveParameters(
-        private static X9ECParameters GetCurveParameters(
-            string name)
+        private static X9ECParameters GetCurveParameters(string name)
         {
-            // TODO ECGost3410NamedCurves support (returns ECDomainParameters though)
-
-            X9ECParameters ecP = CustomNamedCurves.GetByName(name);
-            if (ecP == null)
-            {
-                ecP = ECNamedCurveTable.GetByName(name);
-            }
-
+            X9ECParameters ecP = ECKeyPairGenerator.FindECCurveByName(name);
             if (ecP == null)
                 throw new Exception("unknown curve name: " + name);
 
-            //return new ECDomainParameters(ecP.Curve, ecP.G, ecP.N, ecP.H, ecP.GetSeed());
             return ecP;
         }
     }
-- 
cgit 1.5.1