summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2015-04-01 13:33:52 (GMT)
committerTudor Florea <tudor.florea@enea.com>2015-07-06 18:19:39 (GMT)
commitaafccf82fe53b9c7a7de4f9df2a6de221c513e22 (patch)
tree7c18a6e8165c03c8a9f251fb24654815b532274b
parenta96624862c157844f02e5353e45be45c8f15881b (diff)
downloadpoky-aafccf82fe53b9c7a7de4f9df2a6de221c513e22.tar.gz
openssl: Upgrade to 1.0.1j
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch1
-rw-r--r--meta/recipes-connectivity/openssl/openssl/ptest-deps.patch30
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1j.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.1g.bb)27
3 files changed, 35 insertions, 23 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch b/meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch
index 2185ff8..770097d 100644
--- a/meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch
+++ b/meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch
@@ -4,6 +4,7 @@ Subject: Initial aarch64 bits.
4X-Git-Url: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=039081b80977e2a5de84e1f88f8b4d025b559956 4X-Git-Url: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=039081b80977e2a5de84e1f88f8b4d025b559956
5 5
6Initial aarch64 bits. 6Initial aarch64 bits.
7Upstream-Status: backport (will be included in 1.0.2)
7--- 8---
8 crypto/bn/bn_lcl.h | 9 +++++++++ 9 crypto/bn/bn_lcl.h | 9 +++++++++
9 crypto/md32_common.h | 18 ++++++++++++++++++ 10 crypto/md32_common.h | 18 ++++++++++++++++++
diff --git a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
new file mode 100644
index 0000000..527e10c
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
@@ -0,0 +1,30 @@
1Remove Makefile dependencies for test targets
2
3These are probably here because the executables aren't always built for
4other platforms (e.g. Windows); however we can safely assume they'll
5always be there. None of the other test targets have such dependencies
6and if we don't remove them, make tries to rebuild the executables and
7fails during run-ptest.
8
9Upstream-Status: Inappropriate [config]
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12
13diff --git a/test/Makefile b/test/Makefile
14index e6fcfb4..5ae043b 100644
15--- a/test/Makefile
16+++ b/test/Makefile
17@@ -322,11 +322,11 @@ test_cms:
18 @echo "CMS consistency test"
19 $(PERL) cms-test.pl
20
21-test_srp: $(SRPTEST)$(EXE_EXT)
22+test_srp:
23 @echo "Test SRP"
24 ../util/shlib_wrap.sh ./srptest
25
26-test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
27+test_heartbeat:
28 ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
29
30 lint:
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
index e519d6e..2da18ae 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
@@ -27,38 +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://Makefiles-ptest.patch \
31 file://openssl-fix-doc.patch \
32 file://fix-cipher-des-ede3-cfb1.patch \ 30 file://fix-cipher-des-ede3-cfb1.patch \
33 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ 31 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
34 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ 32 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
35 file://initial-aarch64-bits.patch \ 33 file://initial-aarch64-bits.patch \
36 file://find.pl \ 34 file://find.pl \
37 file://openssl-fix-des.pod-error.patch \ 35 file://openssl-fix-des.pod-error.patch \
38 file://openssl-CVE-2014-0198-fix.patch \ 36 file://Makefiles-ptest.patch \
39 file://0001-Fix-for-CVE-2014-0195.patch \ 37 file://ptest-deps.patch \
40 file://0001-Fix-CVE-2014-0221.patch \
41 file://0001-Fix-for-CVE-2014-0224.patch \
42 file://0002-Additional-CVE-2014-0224-protection.patch \
43 file://0003-Make-tls_session_secret_cb-work-with-CVE-2014-0224-f.patch \
44 file://0001-Fix-CVE-2014-3470.patch \
45 file://run-ptest \ 38 file://run-ptest \
46 file://openssl-fix-CVE-2014-3566.patch \
47 file://openssl-fix-CVE-2014-3513.patch \
48 file://openssl-fix-CVE-2014-3567.patch \
49 file://openssl-fix-CVE-2014-3568.patch \
50 file://0001-CVE-2014-3569.patch \
51 file://0002-CVE-2015-0204.patch \
52 file://0003-CVE-2015-0205.patch \
53 file://0004-nedded-for-CVE-2014-8275.patch \
54 file://0005-nedded-for-CVE-2014-8275.patch \
55 file://0006-CVE-2014-8275.patch \
56 file://0007-Follow-on-fix-for-CVE-2014-3571.patch \
57 file://0008-CVE-2014-3570.patch \
58 " 39 "
59 40
60SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" 41SRC_URI[md5sum] = "f7175c9cd3c39bb1907ac8bba9df8ed3"
61SRC_URI[sha256sum] = "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028" 42SRC_URI[sha256sum] = "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3"
62 43
63PACKAGES =+ " \ 44PACKAGES =+ " \
64 ${PN}-engines \ 45 ${PN}-engines \