diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2014-04-08 14:49:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-08 17:45:09 +0100 |
commit | 5dd1d7566964c90d33c0c44f569d9336fb0724ce (patch) | |
tree | 6c9516db6873f1254723cbeeca204a43d5d410ba /meta/recipes-connectivity/openssl/openssl/shared-libs.patch | |
parent | c0ac09ab49d7a2b9cc7601ceef2852d690cdf3d1 (diff) | |
download | poky-5dd1d7566964c90d33c0c44f569d9336fb0724ce.tar.gz |
openssl: Upgrade to v1.0.1g
The trigger for the upgrade was the serious "heartbleed" vulnerability
(CVE-2014-0160). More information:
http://www.itnews.com.au/News/382068,serious-openssl-bug-renders-websites-wide-open.aspx
Dropped obsolete patches, because the new version contains them:
0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch
0001-Fix-DTLS-retransmission-from-previous-session.patch
0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch
Modified 2 patches (small changes), in order to apply properly:
initial-aarch64-bits.patch
openssl-fix-doc.patch
Addresses CVEs:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0160
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0076
(From OE-Core rev: ff52836e1838590eeec7d7658e15b21d83cf8455)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/shared-libs.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/shared-libs.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl/shared-libs.patch new file mode 100644 index 0000000000..a7ca0a3078 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/shared-libs.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: openssl-1.0.1e/crypto/Makefile | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.1e.orig/crypto/Makefile | ||
6 | +++ openssl-1.0.1e/crypto/Makefile | ||
7 | @@ -108,7 +108,7 @@ $(LIB): $(LIBOBJ) | ||
8 | |||
9 | shared: buildinf.h lib subdirs | ||
10 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
11 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
12 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
13 | fi | ||
14 | |||
15 | libs: | ||
16 | Index: openssl-1.0.1e/Makefile.org | ||
17 | =================================================================== | ||
18 | --- openssl-1.0.1e.orig/Makefile.org | ||
19 | +++ openssl-1.0.1e/Makefile.org | ||
20 | @@ -310,7 +310,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_ | ||
21 | |||
22 | libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a | ||
23 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
24 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
25 | + $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
26 | else \ | ||
27 | echo "There's no support for shared libraries on this platform" >&2; \ | ||
28 | exit 1; \ | ||
29 | Index: openssl-1.0.1e/ssl/Makefile | ||
30 | =================================================================== | ||
31 | --- openssl-1.0.1e.orig/ssl/Makefile | ||
32 | +++ openssl-1.0.1e/ssl/Makefile | ||
33 | @@ -62,7 +62,7 @@ lib: $(LIBOBJ) | ||
34 | |||
35 | shared: lib | ||
36 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
37 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
38 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
39 | fi | ||
40 | |||
41 | files: | ||