diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-26 12:06:36 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-26 12:06:36 +0000 |
| commit | 48ee9ddb22b36f1adc23290e76287a922488596d (patch) | |
| tree | d9eccedd90f9c573634c5456cfbbb65684214c6e /synapse/crypto/keyring.py | |
| parent | Use tagged version of matrix-angular-sdk (diff) | |
| parent | Bump version numbers and change log (diff) | |
| download | synapse-0.5.1.tar.xz | |
Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse v0.5.1
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 ) |