* [PATCH] sign-file: fix build with CMS support disabled
@ 2016-02-29 19:17 Marc-Antoine Perennou
2016-03-01 0:14 ` David Howells
0 siblings, 1 reply; 4+ messages in thread
From: Marc-Antoine Perennou @ 2016-02-29 19:17 UTC (permalink / raw)
To: keyrings, dhowells, dwmw2, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sign-file: fix build with CMS support disabled
2016-02-29 19:17 [PATCH] sign-file: fix build with CMS support disabled Marc-Antoine Perennou
@ 2016-03-01 0:14 ` David Howells
2016-03-01 8:53 ` [PATCH v2] " Marc-Antoine Perennou
0 siblings, 1 reply; 4+ messages in thread
From: David Howells @ 2016-03-01 0:14 UTC (permalink / raw)
To: Marc-Antoine Perennou; +Cc: dhowells, keyrings, dwmw2, linux-kernel
Can you rebase on:
http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-next
Thanks,
David
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] sign-file: fix build with CMS support disabled
2016-03-01 0:14 ` David Howells
@ 2016-03-01 8:53 ` Marc-Antoine Perennou
2016-03-05 0:10 ` David Woodhouse
0 siblings, 1 reply; 4+ messages in thread
From: Marc-Antoine Perennou @ 2016-03-01 8:53 UTC (permalink / raw)
To: keyrings, dhowells, dwmw2, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-05 0:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-29 19:17 [PATCH] sign-file: fix build with CMS support disabled Marc-Antoine Perennou
2016-03-01 0:14 ` David Howells
2016-03-01 8:53 ` [PATCH v2] " Marc-Antoine Perennou
2016-03-05 0:10 ` David Woodhouse
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®