summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-27 18:10:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-28 10:16:04 +0100
commit425c614070d6eac9096535c24f29a08861857b3a (patch)
tree7fbe28f7ad2f3ddfd88f6cfcad974053d26da9d1 /meta
parent390140e7b9e0ab2a810e7eed1fd3b7e0ef75efe3 (diff)
downloadpoky-425c614070d6eac9096535c24f29a08861857b3a.tar.gz
openssl: Upgrade 1.0.2i -> 1.0.2j
Deals with a CVE issue Drops a patch applied upstream and no longer needed. (From OE-Core rev: ee590ac736ca2a378605fa1272a1c57a1dbc7a57) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/Fix-typo-introduced-by-a03f81f4.patch29
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2j.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.2i.bb)5
2 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/Fix-typo-introduced-by-a03f81f4.patch b/meta/recipes-connectivity/openssl/openssl/Fix-typo-introduced-by-a03f81f4.patch
deleted file mode 100644
index 04112966ab..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/Fix-typo-introduced-by-a03f81f4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 581215a519c66db7255ea360ed25bb00033ccd52 Mon Sep 17 00:00:00 2001
2From: Rich Salz <rsalz@openssl.org>
3Date: Thu, 22 Sep 2016 08:47:45 -0400
4Subject: [PATCH] Fix typo introduced by a03f81f4
5
6Reviewed-by: Richard Levitte <levitte@openssl.org>
7
8Upstream-Status: Backport [https://github.com/openssl/openssl/commit/581215a519c66db7255ea360ed25bb00033ccd52]
9Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
10---
11 crypto/engine/eng_cryptodev.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
15index 65a74df..2a2b95c 100644
16--- a/crypto/engine/eng_cryptodev.c
17+++ b/crypto/engine/eng_cryptodev.c
18@@ -939,7 +939,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
19 if (fstate->mac_len != 0) {
20 if (fstate->mac_data != NULL) {
21 dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
22- if (dstate->ac_data == NULL) {
23+ if (dstate->mac_data == NULL) {
24 printf("cryptodev_digest_init: malloc failed\n");
25 return 0;
26 }
27--
282.1.4
29
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2i.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb
index c32f47296c..257e3cfc4b 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb
@@ -40,10 +40,9 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
40 file://configure-musl-target.patch \ 40 file://configure-musl-target.patch \
41 file://parallel.patch \ 41 file://parallel.patch \
42 file://openssl-util-perlpath.pl-cwd.patch \ 42 file://openssl-util-perlpath.pl-cwd.patch \
43 file://Fix-typo-introduced-by-a03f81f4.patch \
44 " 43 "
45SRC_URI[md5sum] = "678374e63f8df456a697d3e5e5a931fb" 44SRC_URI[md5sum] = "96322138f0b69e61b7212bc53d5e912b"
46SRC_URI[sha256sum] = "9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f" 45SRC_URI[sha256sum] = "e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431"
47 46
48PACKAGES =+ "${PN}-engines" 47PACKAGES =+ "${PN}-engines"
49FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" 48FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"