diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-09 20:55:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:27:00 -0700 |
commit | 60681b118a88fdbc6d231e93463bdd60cdfdf8e5 (patch) | |
tree | 726fd24a028febc6ab2813eddad503322e0d7f5e /meta/recipes-connectivity/openssl | |
parent | 5a78036d08b2c3255ad5ccd1bfb4080e13c9f317 (diff) | |
download | poky-60681b118a88fdbc6d231e93463bdd60cdfdf8e5.tar.gz |
openssl: drop openssl-1.0.2a-x32-asm.patch
The patch was applied in a completely incorrect spot (due to fuzz),
no one noticed or complained. Meanwhile upstream says the issue
has been resolved differently:
https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
(From OE-Core rev: 325e516b59e677dc8e2c5756589fa8037b3e9392)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch | 46 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2n.bb | 1 |
2 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch deleted file mode 100644 index 1e5bfa17d6..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest | ||
2 | |||
3 | From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 | ||
4 | From: Mike Frysinger <vapier@gentoo.org> | ||
5 | Date: Sat, 21 Mar 2015 06:01:25 -0400 | ||
6 | Subject: [PATCH] crypto: use bigint in x86-64 perl | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> | ||
10 | |||
11 | When building on x32 systems where the default type is 32bit, make sure | ||
12 | we can transparently represent 64bit integers. Otherwise we end up with | ||
13 | build errors like: | ||
14 | /usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s | ||
15 | Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890. | ||
16 | ... | ||
17 | ghash-x86_64.s: Assembler messages: | ||
18 | ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression | ||
19 | |||
20 | We don't enable this globally as there are some cases where we'd get | ||
21 | 32bit values interpreted as unsigned when we need them as signed. | ||
22 | |||
23 | Reported-by: Bertrand Jacquin <bertrand@jacquin.bzh> | ||
24 | URL: https://bugs.gentoo.org/542618 | ||
25 | --- | ||
26 | crypto/perlasm/x86_64-xlate.pl | 4 ++++ | ||
27 | 1 file changed, 4 insertions(+) | ||
28 | |||
29 | diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl | ||
30 | index aae8288..0bf9774 100755 | ||
31 | --- a/crypto/perlasm/x86_64-xlate.pl | ||
32 | +++ b/crypto/perlasm/x86_64-xlate.pl | ||
33 | @@ -195,6 +195,10 @@ my %globals; | ||
34 | sub out { | ||
35 | my $self = shift; | ||
36 | |||
37 | + # When building on x32 ABIs, the expanded hex value might be too | ||
38 | + # big to fit into 32bits. Enable transparent 64bit support here | ||
39 | + # so we can safely print it out. | ||
40 | + use bigint; | ||
41 | if ($gas) { | ||
42 | # Solaris /usr/ccs/bin/as can't handle multiplications | ||
43 | # in $self->{value} | ||
44 | -- | ||
45 | 2.3.3 | ||
46 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb index 32444c6092..75e44bae9f 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb | |||
@@ -34,7 +34,6 @@ SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \ | |||
34 | file://openssl-fix-des.pod-error.patch \ | 34 | file://openssl-fix-des.pod-error.patch \ |
35 | file://Makefiles-ptest.patch \ | 35 | file://Makefiles-ptest.patch \ |
36 | file://ptest-deps.patch \ | 36 | file://ptest-deps.patch \ |
37 | file://openssl-1.0.2a-x32-asm.patch \ | ||
38 | file://ptest_makefile_deps.patch \ | 37 | file://ptest_makefile_deps.patch \ |
39 | file://configure-musl-target.patch \ | 38 | file://configure-musl-target.patch \ |
40 | file://parallel.patch \ | 39 | file://parallel.patch \ |