diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
| commit | 23465a30b65808a75afa5cb98bcd1131a2a2c984 (patch) | |
| tree | dcd987034fefbb2649da8346bf36c9d9ded25acc /synapse/crypto | |
| parent | Merge branch 'http_client_refactor' into pushers (diff) | |
| parent | Fix pep8 codestyle warnings (diff) | |
| download | synapse-23465a30b65808a75afa5cb98bcd1131a2a2c984.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/crypto')
| -rw-r--r-- | synapse/crypto/event_signing.py | 2 | ||||
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/crypto/event_signing.py b/synapse/crypto/event_signing.py index 4dff2c0ec2..a9d8953239 100644 --- a/synapse/crypto/event_signing.py +++ b/synapse/crypto/event_signing.py @@ -30,7 +30,7 @@ logger = logging.getLogger(__name__) def check_event_content_hash(event, hash_algorithm=hashlib.sha256): """Check whether the hash for this PDU matches the contents""" computed_hash = _compute_content_hash(event, hash_algorithm) - logging.debug("Expecting hash: %s", encode_base64(computed_hash.digest())) + logger.debug("Expecting hash: %s", encode_base64(computed_hash.digest())) if computed_hash.name not in event.hashes: raise SynapseError( 400, diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 694aed3a7d..ceb03ce6c2 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -135,7 +135,7 @@ class Keyring(object): time_now_ms = self.clock.time_msec() - self.store.store_server_certificate( + yield self.store.store_server_certificate( server_name, server_name, time_now_ms, @@ -143,7 +143,7 @@ class Keyring(object): ) for key_id, key in verify_keys.items(): - self.store.store_server_verify_key( + yield self.store.store_server_verify_key( server_name, server_name, time_now_ms, key ) |