Jan Engelhardt
4970184c4d
- Add upstream fixes since v31 * tools-depmod-fix-Walloc-size.patch * libkmod-remove-pkcs7-obj_to_hash_algo.patch * configure-Check-that-provided-paths-are-absolute.patch - Refresh usrmerge patches to upstream version (cosmetic change only) OBS-URL: https://build.opensuse.org/request/show/1131480 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=234
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 1bb23d7f19d888fbdd96ae0fe929b7086713ef33 Mon Sep 17 00:00:00 2001
|
|
From: Michal Suchanek <msuchanek@suse.de>
|
|
Date: Tue, 18 Jul 2023 14:01:52 +0200
|
|
Subject: [PATCH 1/9] configure: Detect openssl sm3 support
|
|
|
|
Older openssl versions do not support sm3. The code has an option to
|
|
disable the sm3 hash but the lack of openssl support is not detected
|
|
automatically.
|
|
|
|
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
|
Link: https://lore.kernel.org/r/b97e20faa07e9e31c6eaf96683011aa24e80760c.1689681454.git.msuchanek@suse.de
|
|
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
|
|
---
|
|
configure.ac | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 82a853289a83..e5bceeaa1722 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -123,6 +123,13 @@ AC_ARG_WITH([openssl],
|
|
AS_IF([test "x$with_openssl" != "xno"], [
|
|
PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.1.0], [LIBS="$LIBS $libcrypto_LIBS"])
|
|
AC_DEFINE([ENABLE_OPENSSL], [1], [Enable openssl for modinfo.])
|
|
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <openssl/ssl.h>
|
|
+ int nid = NID_sm3;]])], [
|
|
+ AC_MSG_NOTICE([openssl supports sm3])
|
|
+ ], [
|
|
+ AC_MSG_NOTICE([openssl sm3 support not detected])
|
|
+ CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SM3"
|
|
+ ])
|
|
], [
|
|
AC_MSG_NOTICE([openssl support not requested])
|
|
])
|
|
--
|
|
2.42.0
|
|
|