Merge branch 'master' into paul/fixes

This commit is contained in:
Paul "LeoNerd" Evans 2015-07-09 19:52:03 +01:00
commit af1616ba9a

View file

@ -124,7 +124,7 @@ and additional signatures.
signature_base64 = encode_base64(signed.signature)
key_id = "%s:%s" % (signing_key.alg, signing_key.version)
signatures.setdefault(sigature_name, {})[key_id] = signature_base64
signatures.setdefault(signing_name, {})[key_id] = signature_base64
json_object["signatures"] = signatures
if unsigned is not None: