diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-17 15:45:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-17 15:45:43 +0000 |
| commit | d3861b44424aa6f03cc65719bb1527330157abea (patch) | |
| tree | 4377eb0dc5e221862489bdcc802e50e2f1f41cb1 /synapse/storage/keys.py | |
| parent | Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse (diff) | |
| parent | Slightly more aggressive retry timers at HTTP level (diff) | |
| download | synapse-d3861b44424aa6f03cc65719bb1527330157abea.tar.xz | |
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse v0.11.0
Diffstat (limited to 'synapse/storage/keys.py')
| -rw-r--r-- | synapse/storage/keys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py index ffd6daa880..344cacdc75 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py @@ -19,7 +19,7 @@ from synapse.util.caches.descriptors import cachedInlineCallbacks from twisted.internet import defer import OpenSSL -from syutil.crypto.signing_key import decode_verify_key_bytes +from signedjson.key import decode_verify_key_bytes import hashlib |