Fixed equality test for EC keys

Author: rohe

src/cryptojwt/jwe/aes.py

@@ -111,7 +111,7 @@ def encrypt(self, msg, iv='', auth_data=None):
         :param msg: The message to be encrypted
         :param iv: MUST be present, at least 96-bit long
         :param auth_data: Associated data
-        :return: The ciphertext bytes with the 16 byte tag appended.
+        :return: The cipher text bytes with the 16 byte tag appended.
         """
         if not iv:
             raise ValueError('Missing Nonce')

src/cryptojwt/jwk/ec.py

@@ -278,8 +278,10 @@ def __eq__(self, other):
         if cmp_keys(self.pub_key, other.pub_key, ec.EllipticCurvePublicKey):
             if other.private_key():
                 if cmp_keys(self.priv_key, other.priv_key,
-                            ec.EllipticCurvePublicKey):
-                    return False
+                            ec.EllipticCurvePrivateKey):
+                    return True
+            elif self.private_key():
+                return False
             else:
                 return True
 
@@ -289,7 +291,7 @@ def __eq__(self, other):
 def cmp_keys(a, b, key_type):
     if isinstance(a, key_type):
         if isinstance(b, key_type):
-            if a.curve != b.curve:
+            if a.curve.name != b.curve.name:
                 return False
             if a.key_size != b.key_size:
                 return False

tests/test_02_jwk.py

@@ -200,6 +200,14 @@ def test_cmp_neq_ec():
     assert _key1 != _key2
 
 
+def test_cmp_eq_ec():
+    ec_key = generate_private_key(NIST2SEC['P-256'], default_backend())
+    _key1 = ECKey(priv_key=ec_key)
+    _key2 = ECKey(priv_key=ec_key)
+
+    assert _key1 == _key2
+
+
 def test_get_key():
     ec_key = generate_private_key(NIST2SEC['P-256'], default_backend())
     asym_private_key = ECKey(priv_key=ec_key)