From patchwork Wed Jan 13 15:39:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: codarren@hackers.mu X-Patchwork-Id: 8026441 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2FE019F744 for ; Wed, 13 Jan 2016 15:39:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5E5422041B for ; Wed, 13 Jan 2016 15:39:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32F182039D for ; Wed, 13 Jan 2016 15:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751182AbcAMPjh (ORCPT ); Wed, 13 Jan 2016 10:39:37 -0500 Received: from walmailout10.yourhostingaccount.com ([65.254.253.83]:43490 "EHLO walmailout10.yourhostingaccount.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbcAMPjh (ORCPT ); Wed, 13 Jan 2016 10:39:37 -0500 Received: from walmailscan15.yourhostingaccount.com ([10.1.15.15] helo=walmailscan15.yourhostingaccount.com) by walmailout10.yourhostingaccount.com with esmtp (Exim) id 1aJNWJ-0006i9-2O for linux-kbuild@vger.kernel.org; Wed, 13 Jan 2016 10:39:35 -0500 Received: from [10.114.3.32] (helo=walimpout12) by walmailscan15.yourhostingaccount.com with esmtp (Exim) id 1aJNWI-0006PI-TA for linux-kbuild@vger.kernel.org; Wed, 13 Jan 2016 10:39:34 -0500 Received: from walwebmail06.yourhostingaccount.com ([10.1.16.6]) by walimpout12 with id 5TfX1s00807qtNJ01TfaGs; Wed, 13 Jan 2016 10:39:34 -0500 X-Authority-Analysis: ?? Received: from [127.0.0.1] (helo=email.powweb.com) by walwebmail06.yourhostingaccount.com with esmtp (Exim) id 1aJNVr-0005E4-UJ; Wed, 13 Jan 2016 10:39:08 -0500 Received: from 41.136.243.110 (SquirrelMail authenticated user codarren@hackers.mu) by email.powweb.com with HTTP; Wed, 13 Jan 2016 19:39:07 +0400 Message-ID: <92dc47c01a2dd7bd13c71b9febae317a.squirrel@email.powweb.com> In-Reply-To: <9c3047e63bc6451f171bb677b8605e04.squirrel@email.powweb.com> References: <9c3047e63bc6451f171bb677b8605e04.squirrel@email.powweb.com> Date: Wed, 13 Jan 2016 19:39:07 +0400 Subject: [PATCH] v2 linux-next scripts/sign-file.c Fix LibreSSL support From: "Codarren Velvindron" To: codarren@hackers.mu Cc: linux-kbuild@vger.kernel.org User-Agent: SquirrelMail/1.4.19 MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP -Fix SSL headers so that the kernel can build with LibreSSL 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 Signed-off-by: Codarren Velvindron --- scripts/sign-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) #ifndef USE_PKCS7 -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 250a7a6..a0b806d 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