diff options
author | Ross Burton <ross.burton@intel.com> | 2014-10-16 17:18:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-23 16:13:30 +0100 |
commit | 27a877becf76a1410aa96c02a25bb885bfbddf04 (patch) | |
tree | f0b0c340442b7fd19fbee03a39c8f69cbeb96fc3 | |
parent | 2d5bd895656a234a6d6372e1af539e1b5acfd042 (diff) | |
download | poky-27a877becf76a1410aa96c02a25bb885bfbddf04.tar.gz |
openssl: upgrade to 1.0.1j
(From OE-Core rev: 5163eb2c3c492d3640aa0628c29f6b8d446a8261)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Conflicts:
meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
meta/recipes-connectivity/openssl/openssl_1.0.1i.bb
meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1j.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.1g.bb) | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb index 274c69d8cb..2da18aead7 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb | |||
@@ -27,23 +27,19 @@ SRC_URI += "file://configure-targets.patch \ | |||
27 | file://debian/no-symbolic.patch \ | 27 | file://debian/no-symbolic.patch \ |
28 | file://debian/debian-targets.patch \ | 28 | file://debian/debian-targets.patch \ |
29 | file://openssl_fix_for_x32.patch \ | 29 | file://openssl_fix_for_x32.patch \ |
30 | file://openssl-fix-doc.patch \ | ||
31 | file://fix-cipher-des-ede3-cfb1.patch \ | 30 | file://fix-cipher-des-ede3-cfb1.patch \ |
32 | file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ | 31 | file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ |
33 | file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ | 32 | file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ |
34 | file://initial-aarch64-bits.patch \ | 33 | file://initial-aarch64-bits.patch \ |
35 | file://find.pl \ | 34 | file://find.pl \ |
36 | file://openssl-fix-des.pod-error.patch \ | 35 | file://openssl-fix-des.pod-error.patch \ |
37 | file://openssl-1.0.1e-cve-2014-0195.patch \ | 36 | file://Makefiles-ptest.patch \ |
38 | file://openssl-1.0.1e-cve-2014-0198.patch \ | 37 | file://ptest-deps.patch \ |
39 | file://openssl-1.0.1e-cve-2014-0221.patch \ | 38 | file://run-ptest \ |
40 | file://openssl-1.0.1e-cve-2014-0224.patch \ | ||
41 | file://openssl-1.0.1e-cve-2014-3470.patch \ | ||
42 | file://openssl-CVE-2010-5298.patch \ | ||
43 | " | 39 | " |
44 | 40 | ||
45 | SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" | 41 | SRC_URI[md5sum] = "f7175c9cd3c39bb1907ac8bba9df8ed3" |
46 | SRC_URI[sha256sum] = "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028" | 42 | SRC_URI[sha256sum] = "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3" |
47 | 43 | ||
48 | PACKAGES =+ " \ | 44 | PACKAGES =+ " \ |
49 | ${PN}-engines \ | 45 | ${PN}-engines \ |