rpms/shadow-utils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

import UBI shadow-utils-4.9-12.el9

Browse Source
This commit is contained in:
eabdullin 2025-05-13 14:22:19 +00:00
parent cb71d926d0
commit 324f8517e6
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SOURCES/shadow-4.9-salt-remove-rounds.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/libmisc/salt.c b/libmisc/salt.c
index efef4e59..823b093d 100644
--- a/libmisc/salt.c
+++ b/libmisc/salt.c
@@ -439,6 +439,19 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
exit (1);
}
+ char *pos = strstr(retval, "$rounds=");
+ if (pos != NULL) {
+ char str[128];
+ int len;
+ int ret;
+
+ ret = sprintf(str, "%lu", rounds);
+ if (ret > 0) {
+ len = strlen("$rounds=") + strlen(str);
+ memmove(pos, pos + len, strlen(pos + len) + 1);
+ }
+ }
+
return retval;
#else /* USE_XCRYPT_GENSALT */
/* Check if the result buffer is long enough. */

8
SPECS/shadow-utils.spec
View File

@ -1,7 +1,7 @@
Summary: Utilities for managing accounts and shadow password files
Name: shadow-utils
Version: 4.9
Release: 10%{?dist}
Release: 12%{?dist}
Epoch: 2
License: BSD and GPLv2+
URL: https://github.com/shadow-maint/shadow
@ -82,6 +82,8 @@ Patch29: shadow-4.9-skip-over-reserved-ids.patch
Patch30: shadow-4.9-gpasswd-fix-password-leak.patch
# Downstream only patch
Patch31: shadow-4.9-disable-sssd.patch
# Downstream only patch
Patch32: shadow-4.9-salt-remove-rounds.patch
### Dependencies ###
Requires: audit-libs >= 1.6.5
@ -174,6 +176,7 @@ Development files for shadow-utils-subid.
%patch29 -p1 -b .skip-over-reserved-ids
%patch30 -p1 -b .gpasswd-fix-password-leak
%patch31 -p1 -b .disable-sssd
%patch32 -p1 -b .salt-remove-rounds
iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8
cp -f doc/HOWTO.utf8 doc/HOWTO
@ -344,6 +347,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la
%{_libdir}/libsubid.so
%changelog
* Mon Nov 4 2024 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.9-12
- salt: remove rounds from salt string. Resolves: RHEL-58978
* Fri Sep 13 2024 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.9-10
- Disable sssd integration by default. Resolves: RHEL-56352