summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-17 21:04:07 +0100
committerErik Johnston <erik@matrix.org>2014-10-17 21:04:07 +0100
commitf1ddbfaae42f6be373b52aa0cce66901bdad697a (patch)
tree04b2f39c91ec6098ffe3b380442787ac3ce2908f /synapse/crypto/keyring.py
parentkeep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff)
parentCheck that we have auth headers and fail nicely (diff)
downloadsynapse-f1ddbfaae42f6be373b52aa0cce66901bdad697a.tar.xz
Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
-rw-r--r--synapse/crypto/keyring.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py

index 015f76ebe3..2440d604c3 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py
@@ -38,6 +38,7 @@ class Keyring(object): @defer.inlineCallbacks def verify_json_for_server(self, server_name, json_object): + logger.debug("Verifying for %s", server_name) key_ids = signature_ids(json_object, server_name) if not key_ids: raise SynapseError(