<div><br><div class="gmail_quote"><div>On Thu, Jun 8, 2017 at 5:52 AM Changhyeok Bae <<a href="mailto:changhyeok.bae@gmail.com">changhyeok.bae@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Dropped obsolete patches, because the new version contains them:<br>
- fix-cipher-des-ede3-cfb1.patch<br>
- openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch<br>
<br>
Signed-off-by: Changhyeok Bae <<a href="mailto:changhyeok.bae@gmail.com" target="_blank">changhyeok.bae@gmail.com</a>><br>
---<br>
.../openssl/openssl/fix-cipher-des-ede3-cfb1.patch | 21 --------------------<br>
...-pointer-dereference-in-EVP_DigestInit_ex.patch | 23 ----------------------<br>
.../{<a href="http://openssl_1.0.2k.bb" rel="noreferrer" target="_blank">openssl_1.0.2k.bb</a> => <a href="http://openssl_1.0.2l.bb" rel="noreferrer" target="_blank">openssl_1.0.2l.bb</a>} | 8 +++-----<br>
3 files changed, 3 insertions(+), 49 deletions(-)<br>
delete mode 100644 meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch<br>
delete mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch<br>
rename meta/recipes-connectivity/openssl/{<a href="http://openssl_1.0.2k.bb" rel="noreferrer" target="_blank">openssl_1.0.2k.bb</a> => <a href="http://openssl_1.0.2l.bb" rel="noreferrer" target="_blank">openssl_1.0.2l.bb</a>} (86%)<br>
<br>
diff --git a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch b/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch<br>
deleted file mode 100644<br>
index 2a318a4..0000000<br>
--- a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch<br>
+++ /dev/null<br>
@@ -1,21 +0,0 @@<br>
-Upstream-Status: Submitted<br>
-<br>
-This patch adds the fix for one of the ciphers used in openssl, namely<br>
-the cipher des-ede3-cfb1. Complete bug log and patch is present here:<br>
-<a href="http://rt.openssl.org/Ticket/Display.html?id=2867" rel="noreferrer" target="_blank">http://rt.openssl.org/Ticket/Display.html?id=2867</a><br>
-<br>
-Signed-off-by: Muhammad Shakeel <<a href="mailto:muhammad_shakeel@mentor.com" target="_blank">muhammad_shakeel@mentor.com</a>><br>
-<br>
-Index: openssl-1.0.2/crypto/evp/e_des3.c<br>
-===================================================================<br>
---- openssl-1.0.2.orig/crypto/evp/e_des3.c<br>
-+++ openssl-1.0.2/crypto/evp/e_des3.c<br>
-@@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH<br>
- size_t n;<br>
- unsigned char c[1], d[1];<br>
-<br>
-- for (n = 0; n < inl; ++n) {<br>
-+ for (n = 0; n * 8 < inl; ++n) {<br>
- c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;<br>
- DES_ede3_cfb_encrypt(c, d, 1, 1,<br>
- &data(ctx)->ks1, &data(ctx)->ks2,<br>
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch<br>
deleted file mode 100644<br>
index f736e5c..0000000<br>
--- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch<br>
+++ /dev/null<br>
@@ -1,23 +0,0 @@<br>
-openssl: avoid NULL pointer dereference in EVP_DigestInit_ex()<br>
-<br>
-We should avoid accessing the type pointer if it's NULL,<br>
-this could happen if ctx->digest is not NULL.<br>
-<br>
-Upstream-Status: Submitted<br>
-<a href="http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html" rel="noreferrer" target="_blank">http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html</a><br>
-<br>
-Signed-off-by: Xufeng Zhang <<a href="mailto:xufeng.zhang@windriver.com" target="_blank">xufeng.zhang@windriver.com</a>><br>
----<br>
-Index: openssl-1.0.2h/crypto/evp/digest.c<br>
-===================================================================<br>
---- openssl-1.0.2h.orig/crypto/evp/digest.c<br>
-+++ openssl-1.0.2h/crypto/evp/digest.c<br>
-@@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c<br>
- type = ctx->digest;<br>
- }<br>
- #endif<br>
-- if (ctx->digest != type) {<br>
-+ if (type && (ctx->digest != type)) {<br>
- if (ctx->digest && ctx->digest->ctx_size) {<br>
- OPENSSL_free(ctx->md_data);<br>
- ctx->md_data = NULL;<br>
diff --git a/meta/recipes-connectivity/openssl/<a href="http://openssl_1.0.2k.bb" rel="noreferrer" target="_blank">openssl_1.0.2k.bb</a> b/meta/recipes-connectivity/openssl/<a href="http://openssl_1.0.2l.bb" rel="noreferrer" target="_blank">openssl_1.0.2l.bb</a><br>
similarity index 86%<br>
rename from meta/recipes-connectivity/openssl/<a href="http://openssl_1.0.2k.bb" rel="noreferrer" target="_blank">openssl_1.0.2k.bb</a><br>
rename to meta/recipes-connectivity/openssl/<a href="http://openssl_1.0.2l.bb" rel="noreferrer" target="_blank">openssl_1.0.2l.bb</a><br>
index 83d1a50..a2ef2ac 100644<br>
--- a/meta/recipes-connectivity/openssl/<a href="http://openssl_1.0.2k.bb" rel="noreferrer" target="_blank">openssl_1.0.2k.bb</a><br>
+++ b/meta/recipes-connectivity/openssl/<a href="http://openssl_1.0.2l.bb" rel="noreferrer" target="_blank">openssl_1.0.2l.bb</a><br>
@@ -7,7 +7,7 @@ DEPENDS += "cryptodev-linux"<br>
CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"<br>
CFLAG_append_class-native = " -fPIC"<br>
<br>
-LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6"<br>
+LIC_FILES_CHKSUM = "file://LICENSE;md5=057d9218c6180e1d9ee407572b2dd225"<br>
</blockquote><div><br></div><div>What resulted in this change</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
export DIRS = "crypto ssl apps engines"<br>
export OE_LDFLAGS="${LDFLAGS}"<br>
@@ -32,8 +32,6 @@ SRC_URI += "file://<a href="http://find.pl" rel="noreferrer" target="_blank">find.pl</a>;subdir=${BP}/util/ \<br>
file://debian1.0.2/version-script.patch \<br>
file://debian1.0.2/soname.patch \<br>
file://openssl_fix_for_x32.patch \<br>
- file://fix-cipher-des-ede3-cfb1.patch \<br>
- file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \<br>
file://openssl-fix-des.pod-error.patch \<br>
file://Makefiles-ptest.patch \<br>
file://ptest-deps.patch \<br>
@@ -45,8 +43,8 @@ SRC_URI += "file://<a href="http://find.pl" rel="noreferrer" target="_blank">find.pl</a>;subdir=${BP}/util/ \<br>
file://Use-SHA256-not-MD5-as-default-digest.patch \<br>
file://0001-Fix-build-with-clang-using-external-assembler.patch \<br>
"<br>
-SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"<br>
-SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"<br>
+SRC_URI[md5sum] = "f85123cd390e864dfbe517e7616e6566"<br>
+SRC_URI[sha256sum] = "ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c"<br>
<br>
PACKAGES =+ "${PN}-engines"<br>
FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"<br>
--<br>
2.7.4<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>