Fixes issue #205 with managed room names
This commit is contained in:
parent
c3d2092f3d
commit
3042efddbc
@ -476,8 +476,10 @@ class RoomPasswordProvider(object):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def _computeRoomHash(roomName, password, salt):
|
def _computeRoomHash(roomName, password, salt):
|
||||||
roomName = roomName.encode('utf8')
|
roomName = roomName.encode('utf8')
|
||||||
salt = hashlib.sha256(salt).hexdigest()
|
salt = salt.encode('utf8')
|
||||||
provisionalHash = hashlib.sha256(roomName + salt).hexdigest()
|
password = password.encode('utf8')
|
||||||
|
salt = hashlib.sha256(salt).hexdigest().encode('utf8')
|
||||||
|
provisionalHash = hashlib.sha256(roomName + salt).hexdigest().encode('utf8')
|
||||||
return hashlib.sha1(provisionalHash + salt + password).hexdigest()[:12].upper()
|
return hashlib.sha1(provisionalHash + salt + password).hexdigest()[:12].upper()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user