un-compatibility-break Curve arguments

Put openssl_name= at the end, with a default value. This allows external
code written against 0.11 to keep working. Thanks to @hoffmabc for the
catch.

Author: warner

ecdsa/curves.py

@@ -10,8 +10,7 @@ def orderlen(order):
 
 # the NIST curves
 class Curve:
-    def __init__(self, name, openssl_name,
-                 curve, generator, oid):
+    def __init__(self, name, curve, generator, oid, openssl_name=None):
         self.name = name
         self.openssl_name = openssl_name # maybe None
         self.curve = curve
@@ -23,24 +22,18 @@ def __init__(self, name, openssl_name,
         self.oid = oid
         self.encoded_oid = der.encode_oid(*oid)
 
-NIST192p = Curve("NIST192p", "prime192v1",
-                 ecdsa.curve_192, ecdsa.generator_192,
-                 (1, 2, 840, 10045, 3, 1, 1))
-NIST224p = Curve("NIST224p", "secp224r1",
-                 ecdsa.curve_224, ecdsa.generator_224,
-                 (1, 3, 132, 0, 33))
-NIST256p = Curve("NIST256p", "prime256v1",
-                 ecdsa.curve_256, ecdsa.generator_256,
-                 (1, 2, 840, 10045, 3, 1, 7))
-NIST384p = Curve("NIST384p", "secp384r1",
-                 ecdsa.curve_384, ecdsa.generator_384,
-                 (1, 3, 132, 0, 34))
-NIST521p = Curve("NIST521p", "secp521r1",
-                 ecdsa.curve_521, ecdsa.generator_521,
-                 (1, 3, 132, 0, 35))
-SECP256k1 = Curve("SECP256k1", "secp256k1",
-                  ecdsa.curve_secp256k1, ecdsa.generator_secp256k1,
-                  (1, 3, 132, 0, 10))
+NIST192p = Curve("NIST192p", ecdsa.curve_192, ecdsa.generator_192,
+                 (1, 2, 840, 10045, 3, 1, 1), "prime192v1")
+NIST224p = Curve("NIST224p", ecdsa.curve_224, ecdsa.generator_224,
+                 (1, 3, 132, 0, 33), "secp224r1")
+NIST256p = Curve("NIST256p", ecdsa.curve_256, ecdsa.generator_256,
+                 (1, 2, 840, 10045, 3, 1, 7), "prime256v1")
+NIST384p = Curve("NIST384p", ecdsa.curve_384, ecdsa.generator_384,
+                 (1, 3, 132, 0, 34), "secp384r1")
+NIST521p = Curve("NIST521p", ecdsa.curve_521, ecdsa.generator_521,
+                 (1, 3, 132, 0, 35), "secp521r1")
+SECP256k1 = Curve("SECP256k1", ecdsa.curve_secp256k1, ecdsa.generator_secp256k1,
+                  (1, 3, 132, 0, 10), "secp256k1")
 
 curves = [NIST192p, NIST224p, NIST256p, NIST384p, NIST521p, SECP256k1]
 

ecdsa/test_pyecdsa.py

@@ -246,7 +246,7 @@ def test_pubkey_strings(self):
         badpub = VerifyingKey.from_der(pub1_der)
         class FakeGenerator:
             def order(self): return 123456789
-        badcurve = Curve("unknown", None, None, FakeGenerator(), (1,2,3,4,5,6))
+        badcurve = Curve("unknown", None, FakeGenerator(), (1,2,3,4,5,6), None)
         badpub.curve = badcurve
         badder = badpub.to_der()
         self.assertRaises(UnknownCurveError, VerifyingKey.from_der, badder)