diff options
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch | 35 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb | 1 |
2 files changed, 36 insertions, 0 deletions
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 0000000000..7243fb417b --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch | |||
@@ -0,0 +1,35 @@ | |||
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 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb index 88aefdea4f..eacdf8b86e 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 \ | |||
41 | file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ | 41 | file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ |
42 | file://0001-allow-manpages-to-be-disabled.patch \ | 42 | file://0001-allow-manpages-to-be-disabled.patch \ |
43 | file://0001-Fix-BN_LLONG-breakage.patch \ | 43 | file://0001-Fix-BN_LLONG-breakage.patch \ |
44 | file://0001-Fix-DES_LONG-breakage.patch \ | ||
44 | " | 45 | " |
45 | 46 | ||
46 | SRC_URI_append_class-target = " \ | 47 | SRC_URI_append_class-target = " \ |