Remove the 'name' property from the curve info

lib/Crypto/PublicKey/ECC.py

@@ -393,7 +393,7 @@ def _export_openssh(self, compress):
         desc = self._curve.openssh
 
         if desc is None:
-            raise ValueError("Cannot export %s keys as OpenSSH" % self._curve.name)
+            raise ValueError("Cannot export %s keys as OpenSSH" % self.curve)
         elif desc == "ssh-ed25519":
             public_key = self._export_eddsa_public()
             comps = (tobytes(desc), tobytes(public_key))

lib/Crypto/PublicKey/_curve.py

@@ -5,7 +5,7 @@
 # human-friendly name, such as "P-256". The element has the following fields:
 #
 # - p               the prime number that defines the finite field for all modulo operations
-# - b               the constant in the Short Weierstrass curve equation
+# - b               the constant in the Short Weierstrass curve equation (can be None)
 # - order           the number of elements in the group with the generator below
 # - Gx              the affine coordinate X of the generator point
 # - Gy              the affine coordinate Y of the generator point
@@ -15,13 +15,12 @@
 # - context         a raw pointer to memory holding a context for all curve operations (can be None)
 # - canonical       the canonical name of the curve
 # - openssh         the ASCII string used in OpenSSH id files for public keys on this curve
-# - name            the ASCII string which is also a valid key in _curves
 # - rawlib          the reference to the dynamic libary with the low-level functions
 
 class _Curve(object):
 
     def __init__(self, p, b, order, Gx, Gy, G, modulus_bits, oid, context,
-                 canonical, openssh, name, rawlib):
+                 canonical, openssh, rawlib):
         self.p = p
         self.b = b
         self.order = order
@@ -33,5 +32,4 @@ def __init__(self, p, b, order, Gx, Gy, G, modulus_bits, oid, context,
         self.context = context
         self.canonical = canonical
         self.openssh = openssh
-        self.name = name
         self.rawlib = rawlib

lib/Crypto/PublicKey/_edwards.py

@@ -50,9 +50,8 @@ class EcLib(object):
                      255,
                      "1.3.101.112",     # RFC8410
                      None,
-                     "Ed25519",         # Used throughout; do not change
+                     "Ed25519",
                      "ssh-ed25519",
-                     "ed25519",
                      EcLib)
     return ed25519
 
@@ -111,8 +110,7 @@ class EcLib(object):
                    448,
                    "1.3.101.113",       # RFC8410
                    context,
-                   "Ed448",             # Used throughout; do not change
+                   "Ed448",
                    None,
-                   "ed448",
                    EcLib)
     return ed448

lib/Crypto/PublicKey/_montgomery.py

@@ -40,8 +40,7 @@ class EcLib(object):
                         255,
                         "1.3.101.110",      # RFC8410
                         None,
-                        "Curve25519",       # desc: used throughout; do not change
+                        "Curve25519",
                         None,
-                        "curve25519",
                         EcLib)
     return curve25519

lib/Crypto/PublicKey/_nist_ecc.py

@@ -90,7 +90,6 @@ def p192_curve():
                   context,
                   "NIST P-192",
                   "ecdsa-sha2-nistp192",
-                  "p192",
                   EcLib)
     return p192
 
@@ -129,7 +128,6 @@ def p224_curve():
                   context,
                   "NIST P-224",
                   "ecdsa-sha2-nistp224",
-                  "p224",
                   EcLib)
     return p224
 
@@ -168,7 +166,6 @@ def p256_curve():
                   context,
                   "NIST P-256",
                   "ecdsa-sha2-nistp256",
-                  "p256",
                   EcLib)
     return p256
 
@@ -207,7 +204,6 @@ def p384_curve():
                   context,
                   "NIST P-384",
                   "ecdsa-sha2-nistp384",
-                  "p384",
                   EcLib)
     return p384
 
@@ -246,6 +242,5 @@ def p521_curve():
                   context,
                   "NIST P-521",
                   "ecdsa-sha2-nistp521",
-                  "p521",
                   EcLib)
     return p521

lib/Crypto/Signature/DSS.py

@@ -379,7 +379,7 @@ def new(key, mode, encoding='binary', randfunc=None):
     if isinstance(key, EccKey):
         order = key._curve.order
         private_key_attr = 'd'
-        if key._curve.name == "ed25519":
+        if not key.curve.startswith("NIST"):
             raise ValueError("ECC key is not on a NIST P curve")
     elif isinstance(key, DsaKey):
         order = Integer(key.q)

lib/Crypto/Signature/eddsa.py

@@ -138,13 +138,13 @@ def sign(self, msg_or_hash):
         if not self._key.has_private():
             raise TypeError("Private key is needed to sign")
 
-        if self._key._curve.name == "ed25519":
+        if self._key.curve == "Ed25519":
             ph = isinstance(msg_or_hash, SHA512.SHA512Hash)
             if not (ph or is_bytes(msg_or_hash)):
                 raise TypeError("'msg_or_hash' must be bytes of a SHA-512 hash")
             eddsa_sign_method = self._sign_ed25519
 
-        elif self._key._curve.name == "ed448":
+        elif self._key.curve == "Ed448":
             ph = isinstance(msg_or_hash, SHAKE256.SHAKE256_XOF)
             if not (ph or is_bytes(msg_or_hash)):
                 raise TypeError("'msg_or_hash' must be bytes of a SHAKE256 hash")
@@ -224,13 +224,13 @@ def verify(self, msg_or_hash, signature):
         :raise ValueError: if the signature is not authentic
         """
 
-        if self._key._curve.name == "ed25519":
+        if self._key.curve == "Ed25519":
             ph = isinstance(msg_or_hash, SHA512.SHA512Hash)
             if not (ph or is_bytes(msg_or_hash)):
                 raise TypeError("'msg_or_hash' must be bytes of a SHA-512 hash")
             eddsa_verify_method = self._verify_ed25519
 
-        elif self._key._curve.name == "ed448":
+        elif self._key.curve == "Ed448":
             ph = isinstance(msg_or_hash, SHAKE256.SHAKE256_XOF)
             if not (ph or is_bytes(msg_or_hash)):
                 raise TypeError("'msg_or_hash' must be bytes of a SHAKE256 hash")