#221 - added curve classes for X25519/Ed25519 so that PGPy can suppor…

…t it as soon as people obtain builds of OpenSSL that include support for them

pgpy/_curves.py

@@ -48,7 +48,19 @@ class BrainpoolP512R1(object):
     key_size = 512
 
 
+@utils.register_interface(ec.EllipticCurve)
+class X25519(object):
+    name = 'X25519'
+    key_size = 256
+
+
+@utils.register_interface(ec.EllipticCurve)
+class Ed25519(object):
+    name = 'ed25519'
+    key_size = 256
+
+
 # add these curves to the _CURVE_TYPES list
-for curve in [BrainpoolP256R1, BrainpoolP384R1, BrainpoolP512R1]:
+for curve in [BrainpoolP256R1, BrainpoolP384R1, BrainpoolP512R1, X25519, Ed25519]:
     if curve.name not in ec._CURVE_TYPES and curve.name in _openssl_get_supported_curves():
         ec._CURVE_TYPES[curve.name] = curve

pgpy/constants.py

@@ -20,7 +20,7 @@
 
 from .decorators import classproperty
 from .types import FlagEnum
-from ._curves import BrainpoolP256R1, BrainpoolP384R1, BrainpoolP512R1
+from ._curves import BrainpoolP256R1, BrainpoolP384R1, BrainpoolP512R1, X25519, Ed25519
 
 __all__ = ['Backend',
            'EllipticCurveOID',
@@ -58,12 +58,12 @@ class EllipticCurveOID(Enum):
     #:
     #: .. warning::
     #:     This curve is not currently usable by PGPy
-    Curve25519 = ('1.3.6.1.4.1.3029.1.5.1', )
+    Curve25519 = ('1.3.6.1.4.1.3029.1.5.1', X25519)
     #: Twisted Edwards variant of Curve25519
     #:
     #: .. warning::
     #:     This curve is not currently usable by PGPy
-    Ed25519 = ('1.3.6.1.4.1.11591.15.1', )
+    Ed25519 = ('1.3.6.1.4.1.11591.15.1', Ed25519)
     #: NIST P-256, also known as SECG curve secp256r1
     NIST_P256 = ('1.2.840.10045.3.1.7', ec.SECP256R1)
     #: NIST P-384, also known as SECG curve secp384r1