summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2015-03-25 21:46:51 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2015-03-25 21:46:51 +0700
commit3d88159d06742c44948972112e854cbc29e8a8ba (patch)
tree9719e8c61244076ab1bbefde93245bef239d03ad
parentDelete spurious file (diff)
downloadBouncyCastle.NET-ed25519-3d88159d06742c44948972112e854cbc29e8a8ba.tar.xz
Include ANSSI curves in getByOID lookup
-rw-r--r--crypto/src/asn1/x9/ECNamedCurveTable.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/src/asn1/x9/ECNamedCurveTable.cs b/crypto/src/asn1/x9/ECNamedCurveTable.cs
index 70b04a583..d8315c16f 100644
--- a/crypto/src/asn1/x9/ECNamedCurveTable.cs
+++ b/crypto/src/asn1/x9/ECNamedCurveTable.cs
@@ -98,12 +98,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 ecP = SecNamedCurves.GetByOid(oid);
             }
 
+            // NOTE: All the NIST curves are currently from SEC, so no point in redundant OID lookup
+
             if (ecP == null)
             {
                 ecP = TeleTrusTNamedCurves.GetByOid(oid);
             }
 
-            // NOTE: All the NIST curves are currently from SEC, so no point in redundant OID lookup
+            if (ecP == null)
+            {
+                ecP = AnssiNamedCurves.GetByOid(oid);
+            }
 
             return ecP;
         }