diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-27 11:14:11 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-27 11:14:11 +0000 |
commit | acb2d171e88f7e5a60f6468e5b4f39fdb1ce94a3 (patch) | |
tree | 98b171bd5303e03ee123708f6ed96932f29db558 /synapse/rest/voip.py | |
parent | Add script to hash exisitng history (diff) | |
parent | Test pyflakes jenikns integration (diff) | |
download | synapse-acb2d171e88f7e5a60f6468e5b4f39fdb1ce94a3.tar.xz |
Merge branch 'develop' into event_signing
Diffstat (limited to 'synapse/rest/voip.py')
-rw-r--r-- | synapse/rest/voip.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/voip.py b/synapse/rest/voip.py index 2e4627606f..0d0243a249 100644 --- a/synapse/rest/voip.py +++ b/synapse/rest/voip.py @@ -36,7 +36,7 @@ class VoipRestServlet(RestServlet): if not turnUris or not turnSecret or not userLifetime: defer.returnValue( (200, {}) ) - expiry = self.hs.get_clock().time_msec() + userLifetime + expiry = (self.hs.get_clock().time_msec() + userLifetime) / 1000 username = "%d:%s" % (expiry, auth_user.to_string()) mac = hmac.new(turnSecret, msg=username, digestmod=hashlib.sha1) |