Merge branch 'salt_length' of github.com:IdentityPython/JWTConnect-Python-CryptoJWT into salt_length

Author: rohe

src/cryptojwt/key_bundle.py

@@ -1134,8 +1134,8 @@ def sort_func(kd1, kd2):
 
 def order_key_defs(key_def):
     """
-    Sort a set of key definitions. A key definition that defines more then
-    one usage type are splitted into as many definitions as the number of
+    Sort a set of key definitions. A key definition that defines more than
+    one usage type are split into as many definitions as the number of
     usage types specified. One key definition per usage type.
 
     :param key_def: A set of key definitions
@@ -1144,7 +1144,7 @@ def order_key_defs(key_def):
     _int = []
     # First make sure all defs only reference one usage
     for _def in key_def:
-        if len(_def["use"]) > 1:
+        if isinstance(_def, list) and len(_def["use"]) > 1:
             for _use in _def["use"]:
                 _kd = _def.copy()
                 _kd["use"] = _use

src/cryptojwt/key_jar.py

@@ -492,7 +492,9 @@ def _add_key(
                     if _add_keys[0] not in keys:
                         keys.append(_add_keys[0])
                 elif allow_missing_kid:
-                    keys.extend(_add_keys)
+                    for _key in _add_keys:
+                        if _key and _key not in keys:
+                            keys.append(_key)
                 elif no_kid_issuer:
                     try:
                         allowed_kids = no_kid_issuer[issuer_id]