diff --git a/shadow-4.6-salt-remove-rounds.patch b/shadow-4.6-salt-remove-rounds.patch new file mode 100644 index 0000000..48439be --- /dev/null +++ b/shadow-4.6-salt-remove-rounds.patch @@ -0,0 +1,15 @@ +diff --git a/libmisc/salt.c b/libmisc/salt.c +index c72447ea..4940d76e 100644 +--- a/libmisc/salt.c ++++ b/libmisc/salt.c +@@ -248,6 +248,10 @@ static /*@observer@*/const char *gensalt (size_t salt_size) + result[0] = '\0'; + } + ++ if (strstr(result, "rounds=") != NULL) { ++ result[3] = '\0'; ++ } ++ + /* + * Concatenate a pseudo random salt. + */ diff --git a/shadow-utils.spec b/shadow-utils.spec index 6a15dc4..c9c1d5a 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.6 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: https://github.com/shadow-maint/shadow/releases/download/v%{version}/shadow-%{version}.tar.xz @@ -100,6 +100,7 @@ Patch65: shadow-4.6-useradd-check-if-subid-range-exists.patch Patch66: shadow-4.6-skip-over-reserved-ids.patch # https://github.com/shadow-maint/shadow/commit/65c88a43a23c2391dcc90c0abda3e839e9c57904 Patch67: shadow-4.6-gpasswd-fix-password-leak.patch +Patch68: shadow-4.6-salt-remove-rounds.patch License: BSD and GPLv2+ Group: System Environment/Base @@ -203,6 +204,7 @@ Development files for shadow-utils-subid. %patch65 -p1 -b .useradd-check-if-subid-range-exists %patch66 -p1 -b .skip-over-reserved-ids %patch67 -p1 -b .gpasswd-fix-password-leak +%patch68 -p1 -b .salt-remove-rounds iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 cp -f doc/HOWTO.utf8 doc/HOWTO @@ -373,6 +375,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la %{_libdir}/libsubid.so %changelog +* Tue Nov 21 2023 Iker Pedrosa - 2:4.6-22 +- salt: remove rounds from salt string. Resolves: RHEL-16668 + * Thu Nov 2 2023 Iker Pedrosa - 2:4.6-21 - login.defs: include SHA_CRYPT_MAX_ROUNDS. Resolves: RHEL-15024