From patchwork Wed Jan 13 07:49:21 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: 8023331 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B34AFBEEE5 for ; Wed, 13 Jan 2016 08:22:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F164D2041A for ; Wed, 13 Jan 2016 08:22:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F021E20395 for ; Wed, 13 Jan 2016 08:22:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754603AbcAMIWA (ORCPT ); Wed, 13 Jan 2016 03:22:00 -0500 Received: from walmailout04.yourhostingaccount.com ([65.254.253.36]:45217 "EHLO walmailout04.yourhostingaccount.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752483AbcAMIV7 (ORCPT ); Wed, 13 Jan 2016 03:21:59 -0500 X-Greylist: delayed 1951 seconds by postgrey-1.27 at vger.kernel.org; Wed, 13 Jan 2016 03:21:59 EST Received: from mailscan11.yourhostingaccount.com ([10.1.15.11] helo=walmailscan11.yourhostingaccount.com) by walmailout04.yourhostingaccount.com with esmtp (Exim) id 1aJGBK-0000X1-VP for linux-kbuild@vger.kernel.org; Wed, 13 Jan 2016 02:49:26 -0500 Received: from [10.114.3.33] (helo=walimpout13) by walmailscan11.yourhostingaccount.com with esmtp (Exim) id 1aJGBK-0002GZ-Qu for linux-kbuild@vger.kernel.org; Wed, 13 Jan 2016 02:49:26 -0500 Received: from walwebmail02.yourhostingaccount.com ([10.1.16.2]) by walimpout13 with id 5KpP1s00702gC1E01KpSot; Wed, 13 Jan 2016 02:49:26 -0500 X-Authority-Analysis: v=2.1 cv=fagjyigF c=1 sm=1 tr=0 a=dv0r53mSTk2e8KAhgMvRMg==:117 a=GcYPWcQbU6rbY2obXoaymQ==:17 a=pq4jwCggAAAA:8 a=OF-CdTOGAAAA:8 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=_FZyd2kkAAAA:8 a=8nJEP1OIZ-IA:10 a=7aQ_Q-yQQ-AA:10 a=PCUKp29VBgtLX-hEbucA:9 a=tJdFtFIcJui6XC_T:21 a=wDPIemcX1-t82kBR:21 a=wPNLvfGTeEIA:10 Received: from [127.0.0.1] (helo=email.powweb.com) by walwebmail02.yourhostingaccount.com with esmtp (Exim) id 1aJGBF-0007IZ-RI for linux-kbuild@vger.kernel.org; Wed, 13 Jan 2016 02:49:21 -0500 Received: from 50.7.114.56 (SquirrelMail authenticated user codarren@hackers.mu) by email.powweb.com with HTTP; Wed, 13 Jan 2016 02:49:21 -0500 Message-ID: <9c3047e63bc6451f171bb677b8605e04.squirrel@email.powweb.com> Date: Wed, 13 Jan 2016 02:49:21 -0500 Subject: [PATCH] [linux-next] scripts/sign-file.c Fix LibreSSL support] From: codarren@hackers.mu To: 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 HOSTCC scripts/sign-file In file included from scripts/sign-file.c:46: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 --- 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