diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-03 01:12:37 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 01:12:37 +1100 |
| commit | ea708efedd7f207ce3fc05835612391816f8d4a1 (patch) | |
| tree | 42bdd87aaffc48f6d92c7e6b4d748e2c8cb821fe /synapse/api/urls.py | |
| parent | changelog (diff) | |
| parent | Fix typing being reset causing infinite syncs (#4127) (diff) | |
| download | synapse-matthew/heroes-for-avatars.tar.xz | |
Merge branch 'develop' into matthew/heroes-for-avatars github/matthew/heroes-for-avatars matthew/heroes-for-avatars
Diffstat (limited to 'synapse/api/urls.py')
| -rw-r--r-- | synapse/api/urls.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py index 71347912f1..f78695b657 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py @@ -28,7 +28,6 @@ FEDERATION_PREFIX = "/_matrix/federation/v1" STATIC_PREFIX = "/_matrix/static" WEB_CLIENT_PREFIX = "/_matrix/client" CONTENT_REPO_PREFIX = "/_matrix/content" -SERVER_KEY_PREFIX = "/_matrix/key/v1" SERVER_KEY_V2_PREFIX = "/_matrix/key/v2" MEDIA_PREFIX = "/_matrix/media/r0" LEGACY_MEDIA_PREFIX = "/_matrix/media/v1" @@ -64,7 +63,7 @@ class ConsentURIBuilder(object): """ mac = hmac.new( key=self._hmac_secret, - msg=user_id, + msg=user_id.encode('ascii'), digestmod=sha256, ).hexdigest() consent_uri = "%s_matrix/consent?%s" % ( |