From b42b0d3fe527313f7885ec3ac5e582a59c2c07fb Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 24 Sep 2014 15:29:24 +0200 Subject: [PATCH] Use standard base64 encoding with padding to get the same result as coturn. --- synapse/rest/voip.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/rest/voip.py b/synapse/rest/voip.py index 1989a322c..bb0108cbd 100644 --- a/synapse/rest/voip.py +++ b/synapse/rest/voip.py @@ -17,10 +17,10 @@ from twisted.internet import defer from base import RestServlet, client_path_pattern -from syutil.base64util import encode_base64 import hmac import hashlib +import base64 class VoipRestServlet(RestServlet): @@ -40,7 +40,10 @@ class VoipRestServlet(RestServlet): username = "%d:%s" % (expiry, auth_user.to_string()) mac = hmac.new(turnSecret, msg=username, digestmod=hashlib.sha1) - password = encode_base64(mac.digest()) + # We need to use standard base64 encoding here, *not* syutil's encode_base64 + # because we need to add the standard padding to get the same result as the + # TURN server. + password = base64.b64encode(mac.digest()) defer.returnValue( (200, { 'username': username,