From patchwork Mon Mar 4 18:11:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 159567 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4058999jad; Mon, 4 Mar 2019 10:11:51 -0800 (PST) X-Google-Smtp-Source: APXvYqz1JZjUZ0ZjgJrAtFFTubEwubPbl4DXyxEhr2kwmdkzV9O4nod9/tgYZw6l7tyus7bx7doo X-Received: by 2002:a17:902:5ac9:: with SMTP id g9mr21821859plm.205.1551723111661; Mon, 04 Mar 2019 10:11:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551723111; cv=none; d=google.com; s=arc-20160816; b=zLt+xnGX96lol7Gst9nCDlWLx5C9YyxdsUoflH560jqk2Lq9vZ20MWcEK7sY9ySmCR vvQ2GQDP2Spsjb0xc4s3fypoBiXnk+J2qdCIrgiLsDblL/fca0uMZfL0DaxIvoHyRpn4 yM7YlIfo+/y6U52H+RYCnUMGjVbmY+LYL53TuIwI4HL0SSfzXCrqQl5aMo2daX2ITY/M xbJdOB/GgxoIDVjoOsr2NGzQTDgm1Xehi9ISmDum1ETQM1nFX3m6k1g61JsSjIwhAF+m 1TukjCb/vQYEQAH5fb273AyhMssm82flbA+PrWUGrMFssLEsluNndOKSMenmYN6Vr/6q uFLw== 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=YMa1SyL+x1EQoz0YaekKbgRbU/krHkxOI20P8x+L2Rg=; b=NuhILcn2mS/PYc+FqTe5TTAml8az4tUnVtth6yfQOgczcBOlj6Uqs8dOvpkPm0Z01/ NuCFhaD1dPcVUlhXJtBtkXyZEbq+65t+HrkL1tZq5hWeFhS7USsxp3e0Z8bnW0LqGyYM qvhzzWSCrAMOviQLJdQJA4/cefo9xfm9o7b8sfLjmF7MaY0fJBW414YumeKIbgXZL00o 4f11VaXj/IMbCySUzAhYXnsdsmcOTtLJy2sAMf6L0Zip91WY/q5D6JE+SH4s+yxMi0Xn VrelMIJ/ybTYGBwtodmnLc0v1Lp9VrR12biDhIpTzuhKEnbhZqbW8WbkDTQ7kgkumPfG q6aw== 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 l38si5888683pgb.399.2019.03.04.10.11.51; Mon, 04 Mar 2019 10:11:51 -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 B74747CA73; Mon, 4 Mar 2019 18:11:48 +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 171DA7CA53 for ; Mon, 4 Mar 2019 18:11:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 01DFC40B66; Mon, 4 Mar 2019 18:11:48 +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 m7ZVX7l0Pjsl; Mon, 4 Mar 2019 18:11:47 +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 C3B0440024; Mon, 4 Mar 2019 18:11:43 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id 1D7E216BB89; Mon, 4 Mar 2019 13:11:43 -0500 (EST) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Mon, 4 Mar 2019 13:11:13 -0500 Message-Id: <1551723073-3036-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [thud][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 (From OE-Core rev: 914e1520bf9c45e14bce9993c9131a2c0702b9c9) Signed-off-by: Denys Dmytriyenko Cc: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Denys Dmytriyenko --- .../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 355dbdc..54af100 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 = " \