From patchwork Fri Mar 1 20:05:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 159506 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1140912jad; Fri, 1 Mar 2019 12:06:08 -0800 (PST) X-Google-Smtp-Source: APXvYqz9HhkAKSqlAwZ5sPrdjDcu23KWHR1YgXUgg9jkUnn7Ny8sKiT+mCDwvYFyHWmh/bO8SWN2 X-Received: by 2002:aa7:90c1:: with SMTP id k1mr7287006pfk.202.1551470768314; Fri, 01 Mar 2019 12:06:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551470768; cv=none; d=google.com; s=arc-20160816; b=WH9pkryFEjw4fudmCkrK4MKUpEH49qJ94tE3puHbkNpK4yZgN5pKDfzBpmV8rUAwsZ qVG8Djc+evAuqfsC2WcrITCwUDCyZ8yQICCGGC674OZGAJUkFppf+qqxB6KvJTmE812+ l5gpu6RyJoq2VrNJElucu2al4wcBx/ViSDd6DS1QhqfUYM6ROJlZALHS26b/+Q5+gXdr qNm5XIY5cf95LvCxrXfu+Ot9HVnJaj1OPRFk1raV3FNi83eCBSQ4TzGDYFZ83cQb8wV7 BuSBNPFKWXpDEuWcIa5TYen5JLVlX0J3oHRTPifdecECRqR0hgQLJsjOSYkXzPLenS+7 J7aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to; bh=4FNPIWor0ya96efTLcPDn3sKuoFYb/DMitLJu+8+ub4=; b=S1YxBbnkOtXMGaqEBBlCvkb/qy6DQ99ELuABC0+8hlcRDYsSb06N8iRTqNzgl3SFp8 OloqB33460Qz8kn1z1jTPZPOnc2A8A1/pa1ySBN7ev29yLp8oSX0TY3uPq7Ulaoc0vVl sshYlXTtj3v5Pk4E8dNSPhIKyaKbLAIGY/sXiVvC3hAEN/iE1mJKqfzXWc/9IlT9N5tu xwcWATpGK/8kK8gjWFfmzgi0RJhXFqSk7EA3jrs1thDIn521W5TB3ghfBLo4bHcODty7 TDLoPnwl4gHNDK5a2YTlCPQk/2Oex+auNXi7ze/wZeqg7E7yetiNTjInAT1AnZOBnZut J9JQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o2si1749434pgh.565.2019.03.01.12.06.07; Fri, 01 Mar 2019 12:06:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 455407CDCB; Fri, 1 Mar 2019 20:06:04 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mail.openembedded.org (Postfix) with ESMTP id 520847CDBD for ; Fri, 1 Mar 2019 20:06:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 3E99A40ACD; Fri, 1 Mar 2019 20:06:04 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wT4VMwpypJfe; Fri, 1 Mar 2019 20:06:04 +0000 (UTC) Received: from mail.denix.org (pool-100-15-91-218.washdc.fios.verizon.net [100.15.91.218]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1A5DE40A2D; Fri, 1 Mar 2019 20:06:02 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id BEA4A16BA93; Fri, 1 Mar 2019 15:06:01 -0500 (EST) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Fri, 1 Mar 2019 15:05:59 -0500 Message-Id: <1551470759-401-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [PATCH] openssl10: Fix mutliple include assumptions for des.h in opensslconf.h X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Denys Dmytriyenko The fix is heavily based on Khem's previous fix for bn.h/BN_LLONG breakage: https://git.openembedded.org/openembedded-core/commit/?id=f787b0bb9b0626ddbf2ac94cb206c76716a3773d Signed-off-by: Denys Dmytriyenko Cc: Khem Raj --- .../openssl10/0001-Fix-DES_LONG-breakage.patch | 35 ++++++++++++++++++++++ .../openssl/openssl10_1.0.2q.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch b/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch new file mode 100644 index 0000000..7243fb4 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch @@ -0,0 +1,35 @@ +From 1aec49cc45e7cf5ebc059a77081ac3ea2a5aff7b Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Fri, 1 Mar 2019 13:14:56 -0500 +Subject: [PATCH] Fix DES_LONG breakage + +Mimic previous BN_LLONG fix by Khem Raj here. Re-use its description: + +opensslconf.h is defining DES_LONG only when included from des.h which +is not robust at all, especially when include guards are used and +multiple inclusions of a given header is not allowed. so lets take out +the nesting constraint and add OPENSSL_SYS_UEFI constraint instead + +Upstream-Status: Inappropriate [ fixed differently with OpenSSL 1.1+ ] + +Signed-off-by: Denys Dmytriyenko +--- + crypto/opensslconf.h.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in +index a10c10f..0147a4d 100644 +--- a/crypto/opensslconf.h.in ++++ b/crypto/opensslconf.h.in +@@ -48,7 +48,7 @@ + #endif + #endif + +-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) ++#if !defined(OPENSSL_SYS_UEFI) && !defined(DES_LONG) + /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a + * %20 speed up (longs are 8 bytes, int's are 4). */ + #ifndef DES_LONG +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb index 88aefde..eacdf8b 100644 --- a/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb +++ b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb @@ -41,6 +41,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ file://0001-allow-manpages-to-be-disabled.patch \ file://0001-Fix-BN_LLONG-breakage.patch \ + file://0001-Fix-DES_LONG-breakage.patch \ " SRC_URI_append_class-target = " \