summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCodarren Velvindron <codarren@hackers.mu>2016-02-09 17:40:45 +0100
committerDavid Howells <dhowells@redhat.com>2016-02-09 17:40:45 +0100
commit411a6f585c0f7695942497ae1a0f3f313cefc6e0 (patch)
treef9b5519b8abb2f812bdc25f4a6ef9000745970af
parentLinux 4.5-rc3 (diff)
downloadlinux-411a6f585c0f7695942497ae1a0f3f313cefc6e0.tar.xz
linux-411a6f585c0f7695942497ae1a0f3f313cefc6e0.zip
v2 linux-next scripts/sign-file.c Fix LibreSSL support
In file included from scripts/sign-file.c:47:0: /usr/include/openssl/cms.h:62:2: error: #error CMS is disabled. #error CMS is disabled. ^ scripts/Makefile.host:91: recipe for target 'scripts/sign-file' failed make[1]: *** [scripts/sign-file] Error 1 Makefile:567: recipe for target 'scripts' failed make: *** [scripts] Error 2 Fix SSL headers so that the kernel can build with LibreSSL Signed-off-by: Codarren Velvindron <codarren@hackers.mu> Acked-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: David Howells <dhowells@redhat.com>
-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 250a7a645033..a0b806d2b31d 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 || LIBRESSL_VERSION_NUMBER)
#define USE_PKCS7
#endif
#ifndef USE_PKCS7