diff --git a/1000-libkmod-Support-SM3-hash-algorithm.patch b/1000-libkmod-Support-SM3-hash-algorithm.patch new file mode 100644 index 0000000000000000000000000000000000000000..c419904f6a8ed47a0800bbbbd6f07bfe8792fdd4 --- /dev/null +++ b/1000-libkmod-Support-SM3-hash-algorithm.patch @@ -0,0 +1,47 @@ +From f609cb5185acb0955d66795cb297e9fe9d83405a Mon Sep 17 00:00:00 2001 +From: HuaxinLu +Date: Thu, 30 Jun 2022 14:36:05 +0800 +Subject: [PATCH] libkmod: Support SM3 hash algorithm + +SM3 has been supported in kernel and cryptographic libraries like openssl. +This patch adds support for the SM3 algorithm of kmod. + +Signed-off-by: HuaxinLu +--- + libkmod/libkmod-signature.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c +index 4e8748c26c1c..4ae5af63ac22 100644 +--- a/libkmod/libkmod-signature.c ++++ b/libkmod/libkmod-signature.c +@@ -56,6 +56,7 @@ enum pkey_hash_algo { + PKEY_HASH_SHA384, + PKEY_HASH_SHA512, + PKEY_HASH_SHA224, ++ PKEY_HASH_SM3, + PKEY_HASH__LAST + }; + +@@ -68,6 +69,7 @@ const char *const pkey_hash_algo[PKEY_HASH__LAST] = { + [PKEY_HASH_SHA384] = "sha384", + [PKEY_HASH_SHA512] = "sha512", + [PKEY_HASH_SHA224] = "sha224", ++ [PKEY_HASH_SM3] = "sm3", + }; + + enum pkey_id_type { +@@ -161,6 +163,10 @@ static int obj_to_hash_algo(const ASN1_OBJECT *o) + return PKEY_HASH_SHA512; + case NID_sha224: + return PKEY_HASH_SHA224; ++# ifndef OPENSSL_NO_SM3 ++ case NID_sm3: ++ return PKEY_HASH_SM3; ++# endif + default: + return -1; + } +-- +2.24.3 (Apple Git-128) + diff --git a/kmod.spec b/kmod.spec index b258a685440452ecf68557f632305d90ac05e6e8..c07450ccf193f75fc439e8fe21de98ac69f29ee5 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 Name: kmod Version: 25 @@ -19,6 +19,8 @@ Patch03: kmod-modprobe-ignore-builtin-module-on-recursive-removing.patch Patch04: 0001-depmod-prevent-module-dependency-files-missing-durin.patch Patch05: 0002-depmod-prevent-module-dependency-files-corruption-du.patch +Patch1000: 1000-libkmod-Support-SM3-hash-algorithm.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: chrpath BuildRequires: zlib-devel @@ -82,6 +84,8 @@ Doc pages for %{name}. %patch04 -p1 %patch05 -p1 +%patch1000 -p1 + %build export V=1 aclocal @@ -151,6 +155,9 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %doc NEWS README TODO %changelog +* Thu May 25 2023 Tianjia Zhang - 25-19.0.2 +- Support SM3 hash algorithm + * Mon Jul 18 2022 Zhao Hang - 25-19.0.1 - Add doc sub package