update patches for 0.33.5
Richard van der Hoff
5 years ago
17 | 17 |
+ "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"],
|
18 | 18 |
"service_identity>=1.0.0": ["service_identity>=1.0.0"],
|
19 | 19 |
"Twisted>=17.1.0": ["twisted>=17.1.0"],
|
20 | |
|
|
20 |
"treq>=15.1": ["treq>=15.1"],
|
1 | 1 |
===================================================================
|
2 | 2 |
--- package-synapse-debian.orig/synapse/handlers/auth.py
|
3 | 3 |
+++ package-synapse-debian/synapse/handlers/auth.py
|
4 | |
@@ -905,10 +905,10 @@ class AuthHandler(BaseHandler):
|
|
4 |
@@ -904,10 +904,10 @@ class AuthHandler(BaseHandler):
|
5 | 5 |
# Normalise the Unicode in the password
|
6 | 6 |
pw = unicodedata.normalize("NFKC", password)
|
7 | 7 |
|
8 | 8 |
- return bcrypt.checkpw(
|
9 | 9 |
+ return bcrypt.hashpw(
|
10 | 10 |
pw.encode('utf8') + self.hs.config.password_pepper.encode("utf8"),
|
11 | |
stored_hash.encode('utf8')
|
|
11 |
stored_hash
|
12 | 12 |
- )
|
13 | 13 |
+ ) == stored_hash
|
14 | 14 |
|
15 | 15 |
if stored_hash:
|
16 | |
return make_deferred_yieldable(
|
|
16 |
if not isinstance(stored_hash, bytes):
|
17 | 17 |
Index: package-synapse-debian/synapse/python_dependencies.py
|
18 | 18 |
===================================================================
|
19 | 19 |
--- package-synapse-debian.orig/synapse/python_dependencies.py
|
20 | 20 |
+++ package-synapse-debian/synapse/python_dependencies.py
|
21 | |
@@ -47,7 +47,7 @@ REQUIREMENTS = {
|
|
21 |
@@ -48,7 +48,7 @@ REQUIREMENTS = {
|
22 | 22 |
"pyyaml": ["yaml"],
|
23 | 23 |
"pyasn1": ["pyasn1"],
|
24 | 24 |
"daemonize": ["daemonize"],
|
12 | 12 |
"",
|
13 | 13 |
])
|
14 | 14 |
sys.stderr.writelines(message)
|
15 | |
Index: package-synapse-debian/synapse/config/jwt.py
|
|
15 |
Index: package-synapse-debian/synapse/config/jwt_config.py
|
16 | 16 |
===================================================================
|
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
|
19 | 19 |
@@ -19,7 +19,7 @@ MISSING_JWT = (
|
20 | 20 |
"""Missing jwt library. This is required for jwt login.
|
21 | 21 |
|