| Andrew Geissler | ef7893b | 2019-03-06 19:05:14 -0600 | [diff] [blame] | 1 | From 1aec49cc45e7cf5ebc059a77081ac3ea2a5aff7b Mon Sep 17 00:00:00 2001 |
| 2 | From: Denys Dmytriyenko <denys@ti.com> |
| 3 | Date: Fri, 1 Mar 2019 13:14:56 -0500 |
| 4 | Subject: [PATCH] Fix DES_LONG breakage |
| 5 | |
| 6 | Mimic previous BN_LLONG fix by Khem Raj here. Re-use its description: |
| 7 | |
| 8 | opensslconf.h is defining DES_LONG only when included from des.h which |
| 9 | is not robust at all, especially when include guards are used and |
| 10 | multiple inclusions of a given header is not allowed. so lets take out |
| 11 | the nesting constraint and add OPENSSL_SYS_UEFI constraint instead |
| 12 | |
| 13 | Upstream-Status: Inappropriate [ fixed differently with OpenSSL 1.1+ ] |
| 14 | |
| 15 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> |
| 16 | --- |
| 17 | crypto/opensslconf.h.in | 2 +- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in |
| 21 | index a10c10f..0147a4d 100644 |
| 22 | --- a/crypto/opensslconf.h.in |
| 23 | +++ b/crypto/opensslconf.h.in |
| 24 | @@ -48,7 +48,7 @@ |
| 25 | #endif |
| 26 | #endif |
| 27 | |
| 28 | -#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) |
| 29 | +#if !defined(OPENSSL_SYS_UEFI) && !defined(DES_LONG) |
| 30 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a |
| 31 | * %20 speed up (longs are 8 bytes, int's are 4). */ |
| 32 | #ifndef DES_LONG |
| 33 | -- |
| 34 | 2.7.4 |
| 35 | |