Add to_crypto() method to inside the class.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

Author: polhenarejos

cvc/certificates.py

@@ -232,7 +232,7 @@ def find_domain(self, cert_dir='', outer=False):
         try:
             P = CVC().decode(adata).pubkey().find(0x81) if outer is False else None
             if (P):
-                return EcCurve.to_crypto(EcCurve.from_P(P.data()))
+                return EcCurve.from_P(P.data()).to_crypto()
             depth = 10
             while (P == None and depth > 0):
                 car = CVC().decode(adata).outer_car()
@@ -243,7 +243,7 @@ def find_domain(self, cert_dir='', outer=False):
                     adata = f.read()
                     P = CVC().decode(adata).pubkey().find(0x81)
                 if (P):
-                    return EcCurve.to_crypto(EcCurve.from_P(P.data()))
+                    return EcCurve.from_P(P.data()).to_crypto()
                 depth -= 1
         except FileNotFoundError:
             print(f'[Warning: File {car.decode()} not found]')

cvc/ec_curves.py

@@ -32,23 +32,30 @@ class EcCurve(dict):
     def from_name(name):
         for e in EcCurve.__subclasses__():
             if e.__name__.lower() == name.lower():
-                return e
+                return e()
         return UnsupportedCurve
 
-    def to_crypto(curve):
-        if (curve.__name__ == 'Curve25519'):
+    def __to_crypto(name):
+        name = name.lower()
+        if (name == 'curve25519'):
             return ed25519.Ed25519PublicKey
-        elif (curve.__name__ == 'Curve448'):
+        elif (name == 'curve448'):
             return ed448.Ed448PublicKey
         for e in ec.EllipticCurve.__subclasses__():
-            if (e.__name__.lower() == curve.__name__.lower()):
+            if (e.__name__.lower() == name):
                 return e()
         return UnsupportedCurve
 
+    def to_crypto(curve):
+        return EcCurve.__to_crypto(curve.__name__)
+
+    def to_crypto(self):
+        return EcCurve.__to_crypto(self.__class__.__name__)
+
     def from_P(P):
         for e in EcCurve.__subclasses__():
             if e.P == P:
-                return e
+                return e()
         return UnsupportedCurve
 
 class UnsupportedCurve(EcCurve):
@@ -94,7 +101,6 @@ class SECP521R1(EcCurve):
     O = bytearray(unhexlify("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409"))
     F = bytearray(unhexlify("01"))
 
-
 class BrainpoolP192R1(EcCurve):
     P = bytearray(unhexlify("C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297"))
     A = bytearray(unhexlify("6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF"))