diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-24 16:17:38 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-24 16:17:38 +0100 |
| commit | 78323ccdb359404109bfcdd8b5bf6f641ba3ff9b (patch) | |
| tree | 791e3840dff6bf74092a04c1886bf08546b9d31a /synapse/rest/key | |
| parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-78323ccdb359404109bfcdd8b5bf6f641ba3ff9b.tar.xz | |
Remove syutil dependency in favour of smaller single-purpose libraries
Diffstat (limited to 'synapse/rest/key')
| -rw-r--r-- | synapse/rest/key/v1/server_key_resource.py | 6 | ||||
| -rw-r--r-- | synapse/rest/key/v2/local_key_resource.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/synapse/rest/key/v1/server_key_resource.py b/synapse/rest/key/v1/server_key_resource.py index 71e9a51f5c..6df46969c4 100644 --- a/synapse/rest/key/v1/server_key_resource.py +++ b/synapse/rest/key/v1/server_key_resource.py @@ -16,9 +16,9 @@ from twisted.web.resource import Resource from synapse.http.server import respond_with_json_bytes -from syutil.crypto.jsonsign import sign_json -from syutil.base64util import encode_base64 -from syutil.jsonutil import encode_canonical_json +from signedjson.sign import sign_json +from unpaddedbase64 import encode_base64 +from canonicaljson import encode_canonical_json from OpenSSL import crypto import logging diff --git a/synapse/rest/key/v2/local_key_resource.py b/synapse/rest/key/v2/local_key_resource.py index 33cbd7cf8e..ef7699d590 100644 --- a/synapse/rest/key/v2/local_key_resource.py +++ b/synapse/rest/key/v2/local_key_resource.py @@ -16,9 +16,9 @@ from twisted.web.resource import Resource from synapse.http.server import respond_with_json_bytes -from syutil.crypto.jsonsign import sign_json -from syutil.base64util import encode_base64 -from syutil.jsonutil import encode_canonical_json +from signedjson.sign import sign_json +from unpaddedbase64 import encode_base64 +from canonicaljson import encode_canonical_json from hashlib import sha256 from OpenSSL import crypto import logging |