File tree 2 files changed +6
-4
lines changed
2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -1140,8 +1140,8 @@ def sort_func(kd1, kd2):
1140
1140
1141
1141
def order_key_defs (key_def ):
1142
1142
"""
1143
- Sort a set of key definitions. A key definition that defines more then
1144
- one usage type are splitted into as many definitions as the number of
1143
+ Sort a set of key definitions. A key definition that defines more than
1144
+ one usage type are split into as many definitions as the number of
1145
1145
usage types specified. One key definition per usage type.
1146
1146
1147
1147
:param key_def: A set of key definitions
@@ -1150,7 +1150,7 @@ def order_key_defs(key_def):
1150
1150
_int = []
1151
1151
# First make sure all defs only reference one usage
1152
1152
for _def in key_def :
1153
- if len (_def ["use" ]) > 1 :
1153
+ if isinstance ( _def , list ) and len (_def ["use" ]) > 1 :
1154
1154
for _use in _def ["use" ]:
1155
1155
_kd = _def .copy ()
1156
1156
_kd ["use" ] = _use
Original file line number Diff line number Diff line change @@ -506,7 +506,9 @@ def _add_key(
506
506
if _add_keys [0 ] not in keys :
507
507
keys .append (_add_keys [0 ])
508
508
elif allow_missing_kid :
509
- keys .extend (_add_keys )
509
+ for _key in _add_keys :
510
+ if _key and _key not in keys :
511
+ keys .append (_key )
510
512
elif no_kid_issuer :
511
513
try :
512
514
allowed_kids = no_kid_issuer [issuer_id ]
You can’t perform that action at this time.
0 commit comments