summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2016-03-01 09:53:00 +0100
committerDavid Howells <dhowells@redhat.com>2016-03-03 11:50:46 +0100
commit41693d1c03212de3267bc77b1cb196294a438616 (patch)
tree671bb43e94ccce50e5b73233342eacea46114a10 /scripts
parentMODSIGN: linux/string.h should be #included to get memcpy() (diff)
downloadlinux-41693d1c03212de3267bc77b1cb196294a438616.tar.xz
linux-41693d1c03212de3267bc77b1cb196294a438616.zip
sign-file: fix build with CMS support disabled
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> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/sign-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 80b7f7f933d6..d912d5a56a5e 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