Add tests for EC and fix some RSA ones

Author: angelakis

tests/test_03_key_bundle.py

@@ -9,6 +9,7 @@
 import responses
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptojwt.jwk.ec import new_ec_key
+from cryptojwt.jwk.ec import ECKey
 from cryptojwt.jwk.hmac import SYMKey
 from cryptojwt.jwk.rsa import RSAKey
 from cryptojwt.jwk.rsa import import_rsa_key_from_cert_file
@@ -39,6 +40,7 @@ def full_path(local_file):
 
 RSAKEY = os.path.join(BASE_PATH, "cert.key")
 RSA0 = os.path.join(BASE_PATH, "rsa.key")
+EC0 = os.path.join(BASE_PATH, 'ec.key')
 CERT = full_path("cert.pem")
 
 JWK0 = {"keys": [
@@ -319,17 +321,27 @@ def test_get_all():
 
 def test_keybundle_from_local_der():
     kb = keybundle_from_local_file(
-        "{}".format(os.path.join(BASE_PATH, 'rsa.key')),
+        "{}".format(RSA0),
         "der", ['enc'])
     assert len(kb) == 1
     keys = kb.get('rsa')
     assert len(keys) == 1
     assert isinstance(keys[0], RSAKey)
 
 
+def test_ec_keybundle_from_local_der():
+    kb = keybundle_from_local_file(
+        "{}".format(EC0),
+        "der", ['enc'], keytype='EC')
+    assert len(kb) == 1
+    keys = kb.get('ec')
+    assert len(keys) == 1
+    assert isinstance(keys[0], ECKey)
+
+
 def test_keybundle_from_local_der_update():
     kb = keybundle_from_local_file(
-        "file://{}".format(os.path.join(BASE_PATH, 'rsa.key')),
+        "file://{}".format(RSA0),
         "der", ['enc'])
     assert len(kb) == 1
     keys = kb.get('rsa')

tests/test_04_key_jar.py

@@ -23,6 +23,7 @@
                                          "test_keys"))
 RSAKEY = os.path.join(BASE_PATH, "cert.key")
 RSA0 = os.path.join(BASE_PATH, "rsa.key")
+EC0 = os.path.join(BASE_PATH, "ec.key")
 BASEDIR = os.path.abspath(os.path.dirname(__file__))
 
 
@@ -238,6 +239,42 @@ def test_build_keyjar_missing(tmpdir):
     assert len(key_jar[""]) == 1
 
 
+def test_build_RSA_keyjar_from_file(tmpdir):
+    keys = [
+        {
+            "type": "RSA", "key": RSA0,
+            "use": ["enc", "sig"]
+        }]
+
+    key_jar = build_keyjar(keys)
+
+    assert len(key_jar[""]) == 1
+
+
+def test_build_EC_keyjar_missing(tmpdir):
+    keys = [
+        {
+            "type": "EC", "key": os.path.join(tmpdir.dirname, "missing_file"),
+            "use": ["enc", "sig"]
+        }]
+
+    key_jar = build_keyjar(keys)
+
+    assert len(key_jar[""]) == 1
+
+
+def test_build_EC_keyjar_from_file(tmpdir):
+    keys = [
+        {
+            "type": "EC", "key": EC0,
+            "use": ["enc", "sig"]
+        }]
+
+    key_jar = build_keyjar(keys)
+
+    assert len(key_jar[""]) == 1
+
+
 class TestKeyJar(object):
     def test_keyjar_add(self):
         kj = KeyJar()

tests/test_keys/ec.key

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIATa+jC26Vl3hw5oVDpiufCZuUOnvHdlaxW2VusNGKGqoAoGCCqGSM49
+AwEHoUQDQgAEoLqcipC3uBcQA7AfzSI5A9GrEpLl1fJsBPjukveTkOkL2Z5BI4Ja
+5eByAQku71nVtQQhZ9tnP2BR9IrBRK/KpQ==
+-----END EC PRIVATE KEY-----