Rebase touchups; bobkey spec bugfix.

pull/1625/head
Kieran R. Prasch 2020-02-06 18:58:42 -08:00
parent b9679a46b3
commit 22ccdb4d68
2 changed files with 2 additions and 2 deletions

View File

@ -361,6 +361,7 @@ def make_rest_app(
log.info("Bad TreasureMap ID; not storing {}".format(treasure_map_id))
assert False
@rest_app.route('/status/', methods=['GET'])
def status():
if request.args.get('json'):

View File

@ -125,6 +125,5 @@ def test_key_validation(federated_bob):
BobKeyInputRequirer().load({'bobkey': "02f0cb3f3a33f16255d9b2586e6c56570aa07bbeb1157e169f1fb114ffb40037"})
assert "Unknown OpenSSL error." in str(e)
result = BobKeyInputRequirer().load(dict(
bobkey = federated_bob.public_keys(DecryptingPower).hex()))
result = BobKeyInputRequirer().load(dict(bobkey=bytes(federated_bob.public_keys(DecryptingPower)).hex()))
assert isinstance(result['bobkey'], bytes)