Cleaned up a bit.

Author: rohe

src/oidcmsg/__init__.py

@@ -1,2 +1,24 @@
 __author__ = 'Roland Hedberg'
-__version__ = '0.4.0'
+__version__ = '0.5.0'
+
+def proper_path(path):
+    """
+    Clean up the path specification so it looks like something I could use.
+    "./" <path> "/"
+    """
+    if path.startswith("./"):
+        pass
+    elif path.startswith("/"):
+        path = ".%s" % path
+    elif path.startswith("."):
+        while path.startswith("."):
+            path = path[1:]
+        if path.startswith("/"):
+            path = ".%s" % path
+    else:
+        path = "./%s" % path
+
+    if not path.endswith("/"):
+        path += "/"
+
+    return path

src/oidcmsg/key_bundle.py

@@ -8,10 +8,11 @@
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.asymmetric.rsa import generate_private_key
 
 from cryptojwt import as_unicode
-from cryptojwt.jwk import ECKey
+from cryptojwt.jwk import ECKey, NIST2SEC
 from cryptojwt.jwk import JWKException
 from cryptojwt.jwk import RSAKey
 from cryptojwt.jwk import SYMKey
@@ -116,6 +117,19 @@ def rsa_init(spec):
     :param spec:
     :return: KeyBundle
     """
+    if 'name' not in spec:
+        try:
+            _key_name = spec['key']
+        except KeyError:
+            pass
+        else:
+            if '/' in _key_name:
+                (head, tail) = os.path.split(spec['key'])
+                spec['path'] = head
+                spec['name'] = tail
+            else:
+                spec['name'] = _key_name
+
     arg = {}
     for param in ["name", "path", "size"]:
         try:
@@ -130,6 +144,25 @@ def rsa_init(spec):
     return kb
 
 
+def ec_init(spec):
+    """
+    Initiate a keybundle with an elliptic curve key.
+
+    :param spec: Key specifics of the form::
+        {"type": "EC", "crv": "P-256", "use": ["sig"]}
+
+    :return: A KeyBundle instance
+    """
+
+    _key = ec.generate_private_key(NIST2SEC[spec['crv']], default_backend())
+
+    kb = KeyBundle(keytype="EC", keyusage=spec["use"])
+    for use in spec["use"]:
+        eck = ECKey(use=use).load_key(_key)
+        kb.append(eck)
+    return kb
+
+
 class KeyBundle(object):
     def __init__(self, keys=None, source="", cache_time=300, verify_ssl=True,
                  fileformat="jwk", keytype="RSA", keyusage=None):