Moved from 'OCT' to 'oct'.

Author: rohe

src/cryptojwt/__init__.py

@@ -21,7 +21,7 @@
 except ImportError:
     pass
 
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 
 logger = logging.getLogger(__name__)
 

src/cryptojwt/jws/utils.py

@@ -45,7 +45,7 @@ def alg2keytype(alg):
     elif alg.startswith("RS") or alg.startswith("PS"):
         return "RSA"
     elif alg.startswith("HS") or alg.startswith("A"):
-        return "OCT"
+        return "oct"
     elif alg.startswith("ES") or alg.startswith("ECDH-ES"):
         return "EC"
     else:

src/cryptojwt/key_bundle.py

@@ -42,7 +42,7 @@
 K2C = {
     "RSA": RSAKey,
     "EC": ECKey,
-    "OCT": SYMKey,
+    "oct": SYMKey,
 }
 
 MAP = {'dec': 'enc', 'enc': 'enc', 'ver': 'sig', 'sig': 'sig'}
@@ -116,7 +116,7 @@ def sym_init(spec):
     except KeyError:
         size = 24
 
-    _kb = KeyBundle(keytype="OCT")
+    _kb = KeyBundle(keytype="oct")
     if 'use' in spec:
         for use in harmonize_usage(spec["use"]):
             _key = new_sym_key(use=use, bytes=size)
@@ -244,7 +244,14 @@ def do_keys(self, keys):
         :return:
         """
         for inst in keys:
-            inst['kty'] = inst["kty"].upper()
+            if inst["kty"].lower() in K2C:
+                inst["kty"] = inst["kty"].lower()
+            elif inst["kty"].upper() in K2C:
+                inst["kty"] = inst["kty"].upper()
+            else:
+                LOGGER.warning('While loading keys, unknown key type: %s', inst['kty'])
+                continue
+
             _typ = inst['kty']
             try:
                 _usage = harmonize_usage(inst['use'])
@@ -668,19 +675,24 @@ def keybundle_from_local_file(filename, typ, usage, keytype="RSA"):
     return _bundle
 
 
-def dump_jwks(kbl, target, private=False):
+def dump_jwks(kbl, target, private=False, symmetric_too=False):
     """
-    Write a JWK to a file. Will ignore symmetric keys !!
+    Write a JWK to a file.
 
     :param kbl: List of KeyBundles
     :param target: Name of the file to which everything should be written
     :param private: Should also the private parts be exported
+    :param symmetric_too: Include symmetric keys or not
     """
 
     keys = []
     for _bundle in kbl:
-        keys.extend([k.serialize(private) for k in _bundle.keys() if
-                     k.kty != 'oct' and not k.inactive_since])
+        if symmetric_too:
+            keys.extend([k.serialize(private) for k in _bundle.keys() if not k.inactive_since])
+        else:
+            keys.extend([k.serialize(private) for k in _bundle.keys() if
+                         k.kty != 'oct' and not k.inactive_since])
+
     res = {"keys": keys}
 
     try:
@@ -719,7 +731,7 @@ def build_key_bundle(key_conf, kid_template=""):
             {"type": "RSA", "key": "cp_keys/key.pem", "use": ["enc", "sig"], 'size': 2048},
             {"type": "EC", "crv": "P-256", "use": ["sig"], "kid": "ec.1"},
             {"type": "EC", "crv": "P-256", "use": ["enc"], "kid": "ec.2"},
-            {"type": "OCT", "bytes":}
+            {"type": "oct", "bytes":}
         ]
 
     Keys in this specification are:
@@ -778,7 +790,7 @@ def build_key_bundle(key_conf, kid_template=""):
                     _bundle = ec_init(spec)
             else:
                 _bundle = ec_init(spec)
-        elif typ.upper() == "OCT":
+        elif typ.lower() == "oct":
             _bundle = sym_init(spec)
         else:
             continue
@@ -1052,7 +1064,7 @@ def key_gen(type, **kwargs):
             logging.error("Unknown curve: %s", crv)
             raise ValueError("Unknown curve: {}".format(crv))
         _key = new_ec_key(crv=crv, **kargs)
-    elif type.upper() in ["SYM", "OCT"]:
+    elif type.lower() in ["sym", "oct"]:
         keysize = kwargs.get("bytes", 24)
         randomkey = os.urandom(keysize)
         _key = SYMKey(key=randomkey, **kargs)

src/cryptojwt/key_jar.py

@@ -653,7 +653,7 @@ def build_keyjar(key_conf, kid_template="", keyjar=None, owner=''):
             {"type": "RSA", "key": "cp_keys/key.pem", "use": ["enc", "sig"]},
             {"type": "EC", "crv": "P-256", "use": ["sig"], "kid": "ec.1"},
             {"type": "EC", "crv": "P-256", "use": ["enc"], "kid": "ec.2"}
-            {"type": "OCT", "bytes": 32, "use":["sig"]}
+            {"type": "oct", "bytes": 32, "use":["sig"]}
         ]
 
     Keys in this specification are:

tests/test_03_key_bundle.py

@@ -435,16 +435,30 @@ def test_dump_jwks():
     kb2 = KeyBundle([a, b])
 
     kb1 = rsa_init({'use': ['enc', 'sig'], 'size': 1024, 'name': 'rsa', 'path': 'keys'})
+
+    # Will not dump symmetric keys
     dump_jwks([kb1, kb2], 'jwks_combo')
 
     # Now read it
 
     nkb = KeyBundle(source='file://jwks_combo', fileformat='jwks')
 
-    assert len(nkb) == 4
+    assert len(nkb) == 2
     # both RSA keys
     assert len(nkb.get('rsa')) == 2
 
+    # Will dump symmetric keys
+    dump_jwks([kb1, kb2], 'jwks_combo',symmetric_too=True)
+
+    # Now read it
+    nkb = KeyBundle(source='file://jwks_combo', fileformat='jwks')
+
+    assert len(nkb) == 4
+    # two RSA keys
+    assert len(nkb.get('rsa')) == 2
+    # two symmetric keys
+    assert len(nkb.get('oct')) == 2
+
 
 def test_mark_as_inactive():
     desc = {"kty": "oct", "key": "highestsupersecret", "use": "sig"}
@@ -657,7 +671,7 @@ def test_keys():
 EXPECTED = [
     b'iA7PvG_DfJIeeqQcuXFmvUGjqBkda8In_uMpZrcodVA',
     b'akXzyGlXg8yLhsCczKb_r8VERLx7-iZBUMIVgg2K7p4',
-    b'Rdy8n5h0fo2q9USHJ6HQKnNZFynN1pWN_X6Bc_Tx-lE'
+    b'kLsuyGef1kfw5-t-N9CJLIHx_dpZ79-KemwqjwdrvTI'
 ]
 
 
@@ -829,7 +843,7 @@ def test_build_key_bundle_sym():
 
     assert len(_kb.get('RSA')) == 0
     assert len(_kb.get('EC')) == 0
-    assert len(_kb.get('OCT')) == 3
+    assert len(_kb.get('oct')) == 3
 
 
 def test_key_bundle_difference_none():

tests/test_06_jws.py

@@ -225,7 +225,7 @@ def test_hmac_512():
 
 def test_hmac_from_keyrep():
     payload = "Please take a moment to register today"
-    symkeys = [k for k in SIGJWKS if k.kty == "OCT"]
+    symkeys = [k for k in SIGJWKS if k.kty == "oct"]
     _jws = JWS(payload, alg="HS512")
     _jwt = _jws.sign_compact(symkeys)