diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-27 18:10:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-28 10:15:54 +0100 |
| commit | ee590ac736ca2a378605fa1272a1c57a1dbc7a57 (patch) | |
| tree | 45620cb0b88ea126574a554f9203e7a8026669db | |
| parent | 82353471ccaae59967df7f14de0b4065cbc8169a (diff) | |
| download | openembedded-core-contrib-ee590ac736ca2a378605fa1272a1c57a1dbc7a57.tar.gz | |
openssl: Upgrade 1.0.2i -> 1.0.2j
Deals with a CVE issue
Drops a patch applied upstream and no longer needed.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/Fix-typo-introduced-by-a03f81f4.patch | 29 | ||||
| -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 @@ -From 581215a519c66db7255ea360ed25bb00033ccd52 Mon Sep 17 00:00:00 2001 -From: Rich Salz <rsalz@openssl.org> -Date: Thu, 22 Sep 2016 08:47:45 -0400 -Subject: [PATCH] Fix typo introduced by a03f81f4 - -Reviewed-by: Richard Levitte <levitte@openssl.org> - -Upstream-Status: Backport [https://github.com/openssl/openssl/commit/581215a519c66db7255ea360ed25bb00033ccd52] -Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> ---- - crypto/engine/eng_cryptodev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c -index 65a74df..2a2b95c 100644 ---- a/crypto/engine/eng_cryptodev.c -+++ b/crypto/engine/eng_cryptodev.c -@@ -939,7 +939,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) - if (fstate->mac_len != 0) { - if (fstate->mac_data != NULL) { - dstate->mac_data = OPENSSL_malloc(fstate->mac_len); -- if (dstate->ac_data == NULL) { -+ if (dstate->mac_data == NULL) { - printf("cryptodev_digest_init: malloc failed\n"); - return 0; - } --- -2.1.4 - 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/ \ file://configure-musl-target.patch \ file://parallel.patch \ file://openssl-util-perlpath.pl-cwd.patch \ - file://Fix-typo-introduced-by-a03f81f4.patch \ " -SRC_URI[md5sum] = "678374e63f8df456a697d3e5e5a931fb" -SRC_URI[sha256sum] = "9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f" +SRC_URI[md5sum] = "96322138f0b69e61b7212bc53d5e912b" +SRC_URI[sha256sum] = "e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431" PACKAGES =+ "${PN}-engines" FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" |