| Andrew Geissler | 99467da | 2019-02-25 18:54:23 -0600 | [diff] [blame] | 1 | From 247b3188cde5f3347091cd54271127386d3aece0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 6 Feb 2019 22:10:33 -0800 |
| 4 | Subject: [PATCH] Fix BN_LLONG breakage |
| 5 | |
| 6 | opensslconf.h is un-defining BN_LLONG only when included from bn.h which |
| 7 | is not robust at all, especially when include guards are used and |
| 8 | multiple inclusions of a given header is not allowed. so lets take out |
| 9 | the nesting constraint and add OPENSSL_SYS_UEFI constraint instead |
| 10 | |
| 11 | Upstream-Status: Inappropriate [ fixed differently with OpenSSL 1.1+ ] |
| 12 | |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | crypto/opensslconf.h.in | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in |
| 19 | index 7a1c85d..a10c10f 100644 |
| 20 | --- a/crypto/opensslconf.h.in |
| 21 | +++ b/crypto/opensslconf.h.in |
| 22 | @@ -56,7 +56,7 @@ |
| 23 | #endif |
| 24 | #endif |
| 25 | |
| 26 | -#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) |
| 27 | +#if !defined(OPENSSL_SYS_UEFI) && !defined(CONFIG_HEADER_BN_H) |
| 28 | #define CONFIG_HEADER_BN_H |
| 29 | #undef BN_LLONG |
| 30 | |
| 31 | -- |
| 32 | 2.20.1 |
| 33 | |