From 9f5f028dc47c3c66b42aac2fa85a965078fb3cf1 Mon Sep 17 00:00:00 2001
From: houmingyong <houmingyong@huawei.com>
Date: Fri, 19 Dec 2025 09:38:49 +0800
Subject: [PATCH] fix the missing SM3 macro in get_salt()

---
 shadow-add-sm3-crypt-support.patch | 13 +++++++++++--
 shadow.spec                        |  5 ++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/shadow-add-sm3-crypt-support.patch b/shadow-add-sm3-crypt-support.patch
index 9d8ef7f..d2d379e 100644
--- a/shadow-add-sm3-crypt-support.patch
+++ b/shadow-add-sm3-crypt-support.patch
@@ -11,10 +11,10 @@ Subject: [PATCH] shadow add sm3 crypt support
  lib/obscure.c   |  3 ++
  lib/salt.c      | 98 ++++++++++++++++++++++++++++++++++++++++++++++++-
  src/chgpasswd.c | 48 +++++++++++++++++-------
- src/chpasswd.c  | 44 ++++++++++++++++------
+ src/chpasswd.c  | 46 ++++++++++++++++------
  src/newusers.c  | 59 +++++++++++++++++++++--------
  src/passwd.c    |  7 +++-
- 10 files changed, 248 insertions(+), 44 deletions(-)
+ 10 files changed, 249 insertions(+), 45 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 5dcd22e..c9cbbf7 100644
@@ -532,6 +532,15 @@ index 1a1a5d5..a2b6e9e 100644
  #ifdef USE_BCRYPT
  		    &&(!IS_CRYPT_METHOD("BCRYPT"))
  #endif				/* USE_BCRYPT */
+@@ -419,7 +434,7 @@ static const char *get_salt(void)
+ 	if (md5flg) {
+ 		crypt_method = "MD5";
+ 	}
+-#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
++#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT) || defined(USE_SM3_CRYPT)
+ 	if (sflg) {
+ #if defined(USE_SHA_CRYPT)
+ 		if (IS_CRYPT_METHOD("SHA256") || IS_CRYPT_METHOD("SHA512")) {
 @@ -430,6 +445,11 @@ static const char *get_salt(void)
  			arg = &yescrypt_cost;
  		}
diff --git a/shadow.spec b/shadow.spec
index 48e220e..4f55137 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -1,6 +1,6 @@
 Name: shadow
 Version: 4.18.0
-Release: 1
+Release: 2
 Epoch: 2
 License: BSD-3-Clause AND GPL-2.0-or-later
 Summary: Tools for managing accounts and shadow password files
@@ -179,6 +179,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.{la,a}
 %{_mandir}/*/*
 
 %changelog
+* Fri Dec 19 2025 houmingyong<houmingyong@huawei.com> - 2:4.18.0-2
+- fix the missing SM3 macro in get_salt()
+
 * Thu Dec 04 2025 yixiangzhike <yixiangzhike007@163.com> - 2:4.18.0-1
 - update to 4.18.0
 
-- 
Gitee