forked from pool/python-passlib
Compare commits
6 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 8b95fc4648 | |||
| 3f0b6c7fd9 | |||
| e503c6cbd8 | |||
| 090ebd628b | |||
| 2c862d14e1 | |||
| 64231465ec |
15
no-crypt-with-python-313.patch
Normal file
15
no-crypt-with-python-313.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
Index: passlib-1.7.4/passlib/tests/utils.py
|
||||
===================================================================
|
||||
--- passlib-1.7.4.orig/passlib/tests/utils.py
|
||||
+++ passlib-1.7.4/passlib/tests/utils.py
|
||||
@@ -3360,6 +3360,10 @@ class OsCryptMixin(HandlerCase):
|
||||
if hasattr(self.handler, "orig_prefix"):
|
||||
raise self.skipTest("not applicable to wrappers")
|
||||
|
||||
+ # crypt module removed in Python 3.13
|
||||
+ if sys.version_info[:2] >= (3, 13):
|
||||
+ raise self.skipTest("no crypt module with Python 3.13")
|
||||
+
|
||||
# look for first entry that matches current system
|
||||
# XXX: append "/" + platform.release() to string?
|
||||
# XXX: probably should rework to support rows being dicts w/ "minver" / "maxver" keys,
|
||||
@@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 8 01:41:11 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Add patch support-bcrypt-5.0.patch:
|
||||
* Support changes required by bcrypt 5.0.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 11 04:34:50 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Add patch no-crypt-with-python-313.patch:
|
||||
* Do not run tests requiring 'crypt' with Python 3.13.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 26 10:44:49 UTC 2024 - Markéta Machová <mmachova@suse.com>
|
||||
|
||||
- Only run the full testsuite in openSUSE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 3 06:29:11 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
# spec file for package python-passlib
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -36,6 +36,10 @@ URL: https://foss.heptapod.net/python-libs/passlib
|
||||
Source: https://files.pythonhosted.org/packages/source/p/passlib/passlib-%{version}.tar.gz
|
||||
# PATCH-FIX-OPENSUSE Posted to https://foss.heptapod.net/python-libs/passlib/-/issues/185
|
||||
Patch0: no-pkg_resources.patch
|
||||
# PATCH-FIX-OPENSUSE Skip crypt tests under Python 3.13
|
||||
Patch1: no-crypt-with-python-313.patch
|
||||
# PATCH-FIX-OPENSUSE Support bcrypt 5.0+ changes https://foss.heptapod.net/python-libs/passlib/-/issues/196
|
||||
Patch2: support-bcrypt-5.0.patch
|
||||
BuildRequires: %{python_module pip}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module wheel}
|
||||
@@ -46,7 +50,7 @@ BuildRequires: %{python_module argon2_cffi}
|
||||
BuildRequires: %{python_module bcrypt}
|
||||
BuildRequires: %{python_module cryptography}
|
||||
BuildRequires: %{python_module pytest}
|
||||
%if 0%{?suse_version} >= 1550 || 0%{?is_opensuse}
|
||||
%if 0%{?is_opensuse}
|
||||
BuildRequires: %{python_module Django}
|
||||
BuildRequires: %{python_module scrypt}
|
||||
%endif
|
||||
|
||||
44
support-bcrypt-5.0.patch
Normal file
44
support-bcrypt-5.0.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
Index: passlib-1.7.4/passlib/handlers/bcrypt.py
|
||||
===================================================================
|
||||
--- passlib-1.7.4.orig/passlib/handlers/bcrypt.py
|
||||
+++ passlib-1.7.4/passlib/handlers/bcrypt.py
|
||||
@@ -652,6 +652,9 @@ class _BcryptBackend(_BcryptCommon):
|
||||
config = self._get_config(ident)
|
||||
if isinstance(config, unicode):
|
||||
config = config.encode("ascii")
|
||||
+ # bcrypt 5.0 and above require secret to 72 bytes or less
|
||||
+ if len(secret) > 72:
|
||||
+ secret = secret[:72]
|
||||
hash = _bcrypt.hashpw(secret, config)
|
||||
assert isinstance(hash, bytes)
|
||||
if not hash.startswith(config) or len(hash) != len(config)+31:
|
||||
Index: passlib-1.7.4/passlib/tests/test_handlers_bcrypt.py
|
||||
===================================================================
|
||||
--- passlib-1.7.4.orig/passlib/tests/test_handlers_bcrypt.py
|
||||
+++ passlib-1.7.4/passlib/tests/test_handlers_bcrypt.py
|
||||
@@ -13,7 +13,7 @@ from passlib import hash
|
||||
from passlib.handlers.bcrypt import IDENT_2, IDENT_2X
|
||||
from passlib.utils import repeat_string, to_bytes, is_safe_crypt_input
|
||||
from passlib.utils.compat import irange, PY3
|
||||
-from passlib.tests.utils import HandlerCase, TEST_MODE
|
||||
+from passlib.tests.utils import HandlerCase, SkipTest, TEST_MODE
|
||||
from passlib.tests.test_handlers import UPASS_TABLE
|
||||
# module
|
||||
|
||||
@@ -193,6 +193,16 @@ class _bcrypt_test(HandlerCase):
|
||||
#===================================================================
|
||||
# fuzz testing
|
||||
#===================================================================
|
||||
+ def test_77_fuzz_input(self, threaded=False):
|
||||
+ try:
|
||||
+ import bcrypt
|
||||
+ except ImportError:
|
||||
+ return
|
||||
+ bcrypt_version = tuple([int(x) for x in bcrypt.__version__.split('.')])
|
||||
+ if bcrypt_version >= (5, 0, 0):
|
||||
+ raise SkipTest("requires bcrypt < 5.0")
|
||||
+ super().test_77_fuzz_input(threaded=threaded)
|
||||
+
|
||||
def crypt_supports_variant(self, hash):
|
||||
"""check if OS crypt is expected to support given ident"""
|
||||
from passlib.handlers.bcrypt import bcrypt, IDENT_2X, IDENT_2Y
|
||||
Reference in New Issue
Block a user