Codebase list matrix-synapse / 6a6b6d5
update patches for 0.33.5 Richard van der Hoff 5 years ago
3 changed file(s) with 8 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all
1717 + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"],
1818 "service_identity>=1.0.0": ["service_identity>=1.0.0"],
1919 "Twisted>=17.1.0": ["twisted>=17.1.0"],
20
20 "treq>=15.1": ["treq>=15.1"],
11 ===================================================================
22 --- package-synapse-debian.orig/synapse/handlers/auth.py
33 +++ package-synapse-debian/synapse/handlers/auth.py
4 @@ -905,10 +905,10 @@ class AuthHandler(BaseHandler):
4 @@ -904,10 +904,10 @@ class AuthHandler(BaseHandler):
55 # Normalise the Unicode in the password
66 pw = unicodedata.normalize("NFKC", password)
77
88 - return bcrypt.checkpw(
99 + return bcrypt.hashpw(
1010 pw.encode('utf8') + self.hs.config.password_pepper.encode("utf8"),
11 stored_hash.encode('utf8')
11 stored_hash
1212 - )
1313 + ) == stored_hash
1414
1515 if stored_hash:
16 return make_deferred_yieldable(
16 if not isinstance(stored_hash, bytes):
1717 Index: package-synapse-debian/synapse/python_dependencies.py
1818 ===================================================================
1919 --- package-synapse-debian.orig/synapse/python_dependencies.py
2020 +++ package-synapse-debian/synapse/python_dependencies.py
21 @@ -47,7 +47,7 @@ REQUIREMENTS = {
21 @@ -48,7 +48,7 @@ REQUIREMENTS = {
2222 "pyyaml": ["yaml"],
2323 "pyasn1": ["pyasn1"],
2424 "daemonize": ["daemonize"],
1212 "",
1313 ])
1414 sys.stderr.writelines(message)
15 Index: package-synapse-debian/synapse/config/jwt.py
15 Index: package-synapse-debian/synapse/config/jwt_config.py
1616 ===================================================================
17 --- package-synapse-debian.orig/synapse/config/jwt.py
18 +++ package-synapse-debian/synapse/config/jwt.py
17 --- package-synapse-debian.orig/synapse/config/jwt_config.py
18 +++ package-synapse-debian/synapse/config/jwt_config.py
1919 @@ -19,7 +19,7 @@ MISSING_JWT = (
2020 """Missing jwt library. This is required for jwt login.
2121