From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
To: keyrings@vger.kernel.org, dhowells@redhat.com,
dwmw2@infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] sign-file: fix build with CMS support disabled
Date: Mon, 29 Feb 2016 20:17:07 +0100 [thread overview]
Message-ID: <1456773427-6292-1-git-send-email-Marc-Antoine@Perennou.com> (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 250a7a6..ca3e34b 100755
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -39,7 +39,7 @@
* signing with anything other than SHA1 - so we're stuck with that if such is
* the case.
*/
-#if OPENSSL_VERSION_NUMBER < 0x10000000L
+#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(OPENSSL_NO_CMS)
#define USE_PKCS7
#endif
#ifndef USE_PKCS7
--
2.7.2
next reply other threads:[~2016-02-29 19:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 19:17 Marc-Antoine Perennou [this message]
2016-03-01 0:14 ` David Howells
2016-03-01 8:53 ` [PATCH v2] " Marc-Antoine Perennou
2016-03-05 0:10 ` David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456773427-6292-1-git-send-email-Marc-Antoine@Perennou.com \
--to=marc-antoine@perennou.com \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®