Merge pull request #3835 from krombel/fix_3821

fix VOIP crashes under Python 3
matrix-org · Sep 12, 2018 · 546aee7 · 546aee7
2 parents 33716c4 + 3572a20
commit 546aee7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.d/3835.bugfix b/changelog.d/3835.bugfix
@@ -0,0 +1 @@
+fix VOIP crashes under Python 3 (#3821)
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py
@@ -42,7 +42,11 @@ def on_GET(self, request):
             expiry = (self.hs.get_clock().time_msec() + userLifetime) / 1000
             username = "%d:%s" % (expiry, requester.user.to_string())
 
-            mac = hmac.new(turnSecret, msg=username, digestmod=hashlib.sha1)
+            mac = hmac.new(
+                turnSecret.encode(),
+                msg=username.encode(),
+                digestmod=hashlib.sha1
+            )
             # We need to use standard padded base64 encoding here
             # encode_base64 because we need to add the standard padding to get the
             # same result as the TURN server.