openssl10: Fix mutliple include assumptions for bn.h in opensslconf.h

After adding #pragma once to wrapper header ( opensslconf.h ) this
latent issue got to bite us, where it expect bn.h to be including
openssl.h to define BN_* defines, which is fragile. This patch removes
the contraints for nested includes for bn.h

(From OE-Core rev: f787b0bb9b0626ddbf2ac94cb206c76716a3773d)

(From OE-Core rev: 19d5bffafb17ea0d5e8060716205cab6ab64f302)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2019-02-06 22:25:26 -08:00
committed by Richard Purdie
parent ab1ba8137d
commit 7322e64f9b
2 changed files with 34 additions and 0 deletions

View File

@@ -0,0 +1,33 @@
From 247b3188cde5f3347091cd54271127386d3aece0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 6 Feb 2019 22:10:33 -0800
Subject: [PATCH] Fix BN_LLONG breakage
opensslconf.h is un-defining BN_LLONG only when included from bn.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: Khem Raj <raj.khem@gmail.com>
---
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 7a1c85d..a10c10f 100644
--- a/crypto/opensslconf.h.in
+++ b/crypto/opensslconf.h.in
@@ -56,7 +56,7 @@
#endif
#endif
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
+#if !defined(OPENSSL_SYS_UEFI) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#undef BN_LLONG
--
2.20.1

View File

@@ -40,6 +40,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://0001-Fix-build-with-clang-using-external-assembler.patch \
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 \
"
SRC_URI_append_class-target = " \