From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752223AbcCAIxj (ORCPT ); Tue, 1 Mar 2016 03:53:39 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32847 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbcCAIxh (ORCPT ); Tue, 1 Mar 2016 03:53:37 -0500 From: Marc-Antoine Perennou To: keyrings@vger.kernel.org, dhowells@redhat.com, dwmw2@infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] sign-file: fix build with CMS support disabled Date: Tue, 1 Mar 2016 09:53:00 +0100 Message-Id: <1456822380-2483-1-git-send-email-Marc-Antoine@Perennou.com> X-Mailer: git-send-email 2.7.2 In-Reply-To: <24161.1456791251@warthog.procyon.org.uk> References: <24161.1456791251@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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