Allow importing EC keys from file in KeyBundle

Author: angelakis

src/cryptojwt/key_bundle.py

@@ -14,6 +14,7 @@
 from .exception import UnknownKeyType
 from .exception import UpdateFailed
 from .jwk.ec import ECKey
+from .jwk.ec import import_private_key_from_file
 from .jwk.ec import new_ec_key
 from .jwk.hmac import SYMKey
 from .jwk.jwk import dump_jwk
@@ -167,7 +168,7 @@ def __init__(self, keys=None, source="", cache_time=300, verify_ssl=True,
         :param verify_ssl: Verify the SSL cert used by the server
         :param fileformat: For a local file either "jwks" or "der"
         :param keytype: Iff local file and 'der' format what kind of key it is.
-            presently only 'rsa' is supported.
+            presently 'rsa' and 'ec' are supported.
         :param keyusage: What the key loaded from file should be used for.
             Only applicable for DER files
         :param httpc: A HTTP client function
@@ -229,7 +230,7 @@ def _set_source(self, source, fileformat):
     def _do_local(self, kid):
         if self.fileformat in ['jwks', "jwk"]:
             self.do_local_jwk(self.source)
-        elif self.fileformat == "der":  # Only valid for RSA keys
+        elif self.fileformat == "der":
             self.do_local_der(self.source, self.keytype, self.keyusage, kid)
 
     def do_keys(self, keys):
@@ -285,12 +286,16 @@ def do_local_der(self, filename, keytype, keyusage=None, kid=''):
         Load a DER encoded file amd create a key from it.
 
         :param filename: Name of the file
-        :param keytype: Presently only 'rsa' supported
+        :param keytype: Presently 'rsa' and 'ec' supported
         :param keyusage: encryption ('enc') or signing ('sig') or both
         """
-        _bkey = import_private_rsa_key_from_file(filename)
-
-        if keytype.lower() != 'rsa':
+        if keytype.lower() == 'rsa':
+            _bkey = import_private_rsa_key_from_file(filename)
+            _key = RSAKey().load_key(_bkey)
+        elif keytype.lower() == 'ec':
+            _bkey = import_private_key_from_file(filename)
+            _key = ECKey().load_key(_bkey)
+        else:
             raise NotImplementedError('No support for DER decoding of that key type')
 
         if not keyusage:
@@ -299,7 +304,6 @@ def do_local_der(self, filename, keytype, keyusage=None, kid=''):
             keyusage = harmonize_usage(keyusage)
 
         for use in keyusage:
-            _key = RSAKey().load_key(_bkey)
             _key.use = use
             if kid:
                 _key.kid = kid
@@ -713,8 +717,8 @@ def build_key_bundle(key_conf, kid_template=""):
         The type of key. Presently only 'rsa', 'ec' and 'oct' supported.
 
     key
-        A name of a file where a key can be found. Only works with PEM encoded
-        RSA keys
+        A name of a file where a key can be found. Works with PEM encoded
+        RSA and EC private keys.
 
     use
         What the key should be used for
@@ -752,7 +756,17 @@ def build_key_bundle(key_conf, kid_template=""):
             else:
                 _bundle = rsa_init(spec)
         elif typ == "EC":
-            _bundle = ec_init(spec)
+            if "key" in spec and spec["key"]:
+                error_to_catch = (OSError, IOError,
+                                  DeSerializationNotPossible)
+                try:
+                    _bundle = KeyBundle(source="file://%s" % spec["key"],
+                                        fileformat="der",
+                                        keytype=typ, keyusage=spec["use"])
+                except error_to_catch:
+                    _bundle = ec_init(spec)
+            else:
+                _bundle = ec_init(spec)
         elif typ.upper() == "OCT":
             _bundle = sym_init(spec)
         else:

src/cryptojwt/key_jar.py

@@ -672,8 +672,8 @@ def build_keyjar(key_conf, kid_template="", keyjar=None, owner=''):
         The type of key. Presently only 'rsa', 'oct' and 'ec' supported.
 
     key
-        A name of a file where a key can be found. Only works with PEM encoded
-        RSA keys
+        A name of a file where a key can be found. Works with PEM encoded
+        RSA and EC private keys.
 
     use
         What the key should be used for