summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2017-02-02 09:35:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:22:17 +0000
commit497558512a25c920212e9198fb32ab501733dca9 (patch)
tree795a6e7b7c9c157baf8296a2de1cd8f48143bcea /meta/recipes-connectivity/openssl
parent937643eb0e84250ad2a26b1ebc3a56d850857ed4 (diff)
downloadpoky-497558512a25c920212e9198fb32ab501733dca9.tar.gz
openssl: Updgrade 1.0.2j -> 1.0.2k
(From OE-Core rev: 4d20e8295dbca4bd6e0c8ad36ab922d9dd4d8616) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Pascal Bach <pascal.bach@siemens.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/CVE-2016-7055.patch43
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2k.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.2j.bb)5
2 files changed, 2 insertions, 46 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2016-7055.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2016-7055.patch
deleted file mode 100644
index 83a74cdacb..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2016-7055.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 57c4b9f6a2f800b41ce2836986fe33640f6c3f8a Mon Sep 17 00:00:00 2001
2From: Andy Polyakov <appro@openssl.org>
3Date: Sun, 6 Nov 2016 18:33:17 +0100
4Subject: [PATCH] bn/asm/x86_64-mont.pl: fix for CVE-2016-7055 (Low severity).
5
6Reviewed-by: Rich Salz <rsalz@openssl.org>
7(cherry picked from commit 2fac86d9abeaa643677d1ffd0a139239fdf9406a)
8
9Upstream-Status: Backport [https://github.com/openssl/openssl/commit/57c4b9f6a2f800b41ce2836986fe33640f6c3f8a]
10CVE: CVE-2016-7055
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 crypto/bn/asm/x86_64-mont.pl | 5 ++---
14 1 file changed, 2 insertions(+), 3 deletions(-)
15
16diff --git a/crypto/bn/asm/x86_64-mont.pl b/crypto/bn/asm/x86_64-mont.pl
17index 044fd7e..80492d8 100755
18--- a/crypto/bn/asm/x86_64-mont.pl
19+++ b/crypto/bn/asm/x86_64-mont.pl
20@@ -1148,18 +1148,17 @@ $code.=<<___;
21 mulx 2*8($aptr),%r15,%r13 # ...
22 adox -3*8($tptr),%r11
23 adcx %r15,%r12
24- adox $zero,%r12
25+ adox -2*8($tptr),%r12
26 adcx $zero,%r13
27+ adox $zero,%r13
28
29 mov $bptr,8(%rsp) # off-load &b[i]
30- .byte 0x67
31 mov $mi,%r15
32 imulq 24(%rsp),$mi # "t[0]"*n0
33 xor %ebp,%ebp # xor $zero,$zero # cf=0, of=0
34
35 mulx 3*8($aptr),%rax,%r14
36 mov $mi,%rdx
37- adox -2*8($tptr),%r12
38 adcx %rax,%r13
39 adox -1*8($tptr),%r13
40 adcx $zero,%r14
41--
422.7.4
43
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb
index 94672f90bc..1973f81a24 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb
@@ -41,10 +41,9 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
41 file://configure-musl-target.patch \ 41 file://configure-musl-target.patch \
42 file://parallel.patch \ 42 file://parallel.patch \
43 file://openssl-util-perlpath.pl-cwd.patch \ 43 file://openssl-util-perlpath.pl-cwd.patch \
44 file://CVE-2016-7055.patch \
45 " 44 "
46SRC_URI[md5sum] = "96322138f0b69e61b7212bc53d5e912b" 45SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
47SRC_URI[sha256sum] = "e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431" 46SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
48 47
49PACKAGES =+ "${PN}-engines" 48PACKAGES =+ "${PN}-engines"
50FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" 49FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"