mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 18:42:55 +00:00
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 7fac9b5a88bf45574b92cc3ad74fac32f3bacbcc Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
Date: Thu, 19 Mar 2020 00:15:41 +0300
|
|
Subject: [PATCH] sign-file: full functionality with modern LibreSSL
|
|
|
|
Current pre-release version of LibreSSL has enabled CMS support,
|
|
and now sign-file is fully functional with it.
|
|
|
|
See https://github.com/libressl-portable/openbsd/commits/master
|
|
|
|
To test buildability with LibreSSL:
|
|
~$ git clone https://github.com/libressl-portable/portable.git
|
|
~$ cd portable && ./autogen.sh
|
|
~$ ./configure --prefix=/opt/libressl
|
|
~$ make
|
|
~# make install
|
|
Go to the kernel source tree and:
|
|
~$ gcc -I/opt/libressl/include -L /opt/libressl/lib -lcrypto -Wl,-rpath,/opt/libressl/lib scripts/sign-file.c -o scripts/sign-file
|
|
|
|
Fixes: f8688017 ("sign-file: fix build error in sign-file.c with libressl")
|
|
|
|
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
---
|
|
scripts/sign-file.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
|
|
index fbd34b8e8f57..fd4d7c31d1bf 100644
|
|
--- a/scripts/sign-file.c
|
|
+++ b/scripts/sign-file.c
|
|
@@ -41,9 +41,10 @@
|
|
* signing with anything other than SHA1 - so we're stuck with that if such is
|
|
* the case.
|
|
*/
|
|
-#if defined(LIBRESSL_VERSION_NUMBER) || \
|
|
- OPENSSL_VERSION_NUMBER < 0x10000000L || \
|
|
- defined(OPENSSL_NO_CMS)
|
|
+#if defined(OPENSSL_NO_CMS) || \
|
|
+ ( defined(LIBRESSL_VERSION_NUMBER) \
|
|
+ && (LIBRESSL_VERSION_NUMBER < 0x3010000fL) ) || \
|
|
+ OPENSSL_VERSION_NUMBER < 0x10000000L
|
|
#define USE_PKCS7
|
|
#endif
|
|
#ifndef USE_PKCS7
|
|
--
|
|
2.20.1
|
|
|