diff --git a/shadow-add-sm3-crypt-support.patch b/shadow-add-sm3-crypt-support.patch index 8b1e98a0d7bd04604a98f3529103d1a633e82d6f..b5ee39e0052c05e66a90156fc5ecd9d019b41cb2 100644 --- a/shadow-add-sm3-crypt-support.patch +++ b/shadow-add-sm3-crypt-support.patch @@ -496,8 +496,8 @@ index 1a1a5d5..a2b6e9e 100644 #endif /* USE_YESCRYPT */ - if (bad_s != 0) { +#if defined(USE_SM3_CRYPT) -+ if (( (0 == strcmp (crypt_method, "SM3")) -+ && (0 == getlong(optarg, &sm3_rounds)))) { ++ if (IS_CRYPT_METHOD("SM3") ++ && (0 == getlong(optarg, &sm3_rounds))) { + bad_s = 1; + } +#endif /* USE_SM3_CRYPT */ diff --git a/shadow.spec b/shadow.spec index daee21aed7af30cda6b0f59982dc948ef0197c52..1ca738315398683d65167bef3181eadd522efa93 100644 --- a/shadow.spec +++ b/shadow.spec @@ -1,6 +1,6 @@ Name: shadow Version: 4.14.3 -Release: 2 +Release: 3 Epoch: 2 License: BSD and GPLv2+ Summary: Tools for managing accounts and shadow password files @@ -192,6 +192,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.{la,a} %{_mandir}/*/* %changelog +* Wed Sep 11 2024 beta - 2:4.14.3-3 +- chpasswd fix coredump with s parameter + * Mon Jul 15 2024 wangziliang - 2:4.14.3-2 - backport patches from upstream