diff options
author | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 10:52:16 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 10:52:16 +0100 |
commit | 1c847af28a745434f0707188bc364d90eca5db81 (patch) | |
tree | 23b5b0a59283552b9f07e3b240d68fb221a2c965 /scripts-dev/convert_server_keys.py | |
parent | Merge pull request #244 from matrix-org/markjh/refresh_tokens (diff) | |
parent | Fix typo in module imports and package dependencies (diff) | |
download | synapse-1c847af28a745434f0707188bc364d90eca5db81.tar.xz |
Merge pull request #243 from matrix-org/markjh/remove_syutil
Replace syutil dependency with smaller, single-purpose libraries
Diffstat (limited to 'scripts-dev/convert_server_keys.py')
-rw-r--r-- | scripts-dev/convert_server_keys.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py index a1ee39059c..151551f22c 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py @@ -4,10 +4,10 @@ import sys import json import time import hashlib -from syutil.base64util import encode_base64 -from syutil.crypto.signing_key import read_signing_keys -from syutil.crypto.jsonsign import sign_json -from syutil.jsonutil import encode_canonical_json +from unpaddedbase64 import encode_base64 +from signedjson.key import read_signing_keys +from signedjson.sign import sign_json +from canonicaljson import encode_canonical_json def select_v1_keys(connection): |