diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-12-20 11:33:29 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-12-20 11:33:29 +0000 |
| commit | 1a6d5bfa08b4ba618dcab68e4ed524c4db07da2b (patch) | |
| tree | c29f79003b2ff7bd8a26d5dcbdf44a1f96a71fed /debian/patches/bcrypt.patch | |
| parent | import from package-debian-synapse (diff) | |
| download | synapse-1a6d5bfa08b4ba618dcab68e4ed524c4db07da2b.tar.xz | |
Debian packaging via dh_virtualenv (#4285)
Diffstat (limited to 'debian/patches/bcrypt.patch')
| -rw-r--r-- | debian/patches/bcrypt.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/bcrypt.patch b/debian/patches/bcrypt.patch deleted file mode 100644 index a962949920..0000000000 --- a/debian/patches/bcrypt.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: package-synapse-debian/synapse/handlers/auth.py -=================================================================== ---- package-synapse-debian.orig/synapse/handlers/auth.py -+++ package-synapse-debian/synapse/handlers/auth.py -@@ -921,10 +921,10 @@ class AuthHandler(BaseHandler): - # Normalise the Unicode in the password - pw = unicodedata.normalize("NFKC", password) - -- return bcrypt.checkpw( -+ return bcrypt.hashpw( - pw.encode('utf8') + self.hs.config.password_pepper.encode("utf8"), - stored_hash -- ) -+ ) == stored_hash - - if stored_hash: - if not isinstance(stored_hash, bytes): -Index: package-synapse-debian/synapse/python_dependencies.py -=================================================================== ---- package-synapse-debian.orig/synapse/python_dependencies.py -+++ package-synapse-debian/synapse/python_dependencies.py -@@ -49,7 +49,7 @@ REQUIREMENTS = { - "pyasn1>=0.1.9": ["pyasn1"], - "pyasn1-modules>=0.0.7": ["pyasn1_modules"], - "daemonize>=2.3.1": ["daemonize"], -- "bcrypt>=3.1.0": ["bcrypt>=3.1.0"], -+ "bcrypt": ["bcrypt"], - "pillow>=3.1.2": ["PIL"], - "sortedcontainers>=1.4.4": ["sortedcontainers"], - "psutil>=2.0.0": ["psutil>=2.0.0"], |