[PATCH v2] sign-file: fix build with CMS support disabled

From	Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Newsgroups	linux.kernel
Subject	[PATCH v2] sign-file: fix build with CMS support disabled
Date	2016-03-01 10:00 +0100
Message-ID	<r7OjU-6MP-3@gated-at.bofh.it> (permalink)
References	<r7GcG-1Fc-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Some versions of openssl might have the CMS feature disabled
LibreSSL disables this feature too
If the feature is disabled, fallback to PKCS7

In file included from scripts/sign-file.c:46:0:
/usr/x86_64-pc-linux-gnu/include/openssl/cms.h:62:2: error: #error CMS is disabled.
 #error CMS is disabled.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
 scripts/sign-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 80b7f7f..d912d5a 100755
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -41,7 +41,7 @@
  * signing with anything other than SHA1 - so we're stuck with that if such is
  * the case.
  */
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L || LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(OPENSSL_NO_CMS)
 #define USE_PKCS7
 #endif
 #ifndef USE_PKCS7
-- 
2.7.2

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] sign-file: fix build with CMS support disabled Marc-Antoine Perennou <Marc-Antoine@Perennou.com> - 2016-02-29 20:20 +0100
  Re: [PATCH] sign-file: fix build with CMS support disabled David Howells <dhowells@redhat.com> - 2016-03-01 01:20 +0100
    [PATCH v2] sign-file: fix build with CMS support disabled Marc-Antoine Perennou <Marc-Antoine@Perennou.com> - 2016-03-01 10:00 +0100

csiph-web