From 0da24cac8bde47961396f7da774d8dc8ed847107 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 6 Jul 2016 11:04:44 +0100
Subject: [PATCH] Add null separator to hmac
---
scripts/register_new_matrix_user | 2 ++
synapse/rest/client/v1/register.py | 2 ++
2 files changed, 4 insertions(+)
diff --git a/scripts/register_new_matrix_user b/scripts/register_new_matrix_user
index 987bf32d1..12ed20d62 100755
--- a/scripts/register_new_matrix_user
+++ b/scripts/register_new_matrix_user
@@ -32,7 +32,9 @@ def request_registration(user, password, server_location, shared_secret, admin=F
)
mac.update(user)
+ mac.update("\x00")
mac.update(password)
+ mac.update("\x00")
mac.update("admin" if admin else "notadmin")
mac = mac.hexdigest()
diff --git a/synapse/rest/client/v1/register.py b/synapse/rest/client/v1/register.py
index 25d63a0b0..83872f5f6 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()