summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-06 11:04:44 +0100
committerErik Johnston <erik@matrix.org>2016-07-06 11:05:16 +0100
commit0da24cac8bde47961396f7da774d8dc8ed847107 (patch)
treeab221a2b9b3a30c00c8a521c711bd6722c842e3b /synapse/rest
parentRemove spurious txn (diff)
downloadsynapse-0da24cac8bde47961396f7da774d8dc8ed847107.tar.xz
Add null separator to hmac
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/register.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/register.py b/synapse/rest/client/v1/register.py
index 25d63a0b0b..83872f5f60 100644
--- a/synapse/rest/client/v1/register.py
+++ b/synapse/rest/client/v1/register.py
@@ -336,7 +336,9 @@ class RegisterRestServlet(ClientV1RestServlet):
             digestmod=sha1,
         )
         want_mac.update(user)
+        want_mac.update("\x00")
         want_mac.update(password)
+        want_mac.update("\x00")
         want_mac.update("admin" if admin else "notadmin")
         want_mac = want_mac.hexdigest()