diff options
author | robert_joslyn@selinc.com <robert_joslyn@selinc.com> | 2018-02-21 22:29:08 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 11:11:58 +0000 |
commit | 927e4bbe49d78a4e3ade669843cbd4d4a01b53ca (patch) | |
tree | a820bb14ed860996739c9dec1309d988fec14d26 /meta/recipes-connectivity/openssl | |
parent | f5119cc59fe7aaebe725223177dd314d80ee82bd (diff) | |
download | poky-927e4bbe49d78a4e3ade669843cbd4d4a01b53ca.tar.gz |
openssl: Upgrade from 1.0.2k to 1.0.2n
Drop patches already applied upstream. Refresh parallel.patch using
latest version from master.
Remove x86-64 test binaries included in source code for ptest.
License-Update: Updated copyright years and a minor wording change
(From OE-Core rev: 76020de1afc7f7643bc35de2d49bce6da0c7b879)
Signed-off-by: Robert Joslyn <robert_joslyn@selinc.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 5 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch | 21 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | 23 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/parallel.patch | 177 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2n.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.2k.bb) | 8 |
5 files changed, 113 insertions, 121 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 8f2a797b89..e39cd6c806 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -239,6 +239,11 @@ do_install_ptest () { | |||
239 | # modified again later when stripping them, but that's okay. | 239 | # modified again later when stripping them, but that's okay. |
240 | touch ${D}${PTEST_PATH} | 240 | touch ${D}${PTEST_PATH} |
241 | find ${D}${PTEST_PATH} -type f -print0 | xargs --verbose -0 touch -r ${D}${PTEST_PATH} | 241 | find ${D}${PTEST_PATH} -type f -print0 | xargs --verbose -0 touch -r ${D}${PTEST_PATH} |
242 | |||
243 | # exclude binary files or the package won't install | ||
244 | for d in ssltest_old v3ext x509aux; do | ||
245 | rm -rf ${D}${libdir}/${BPN}/ptest/test/$d | ||
246 | done | ||
242 | } | 247 | } |
243 | 248 | ||
244 | do_install_append_class-native() { | 249 | do_install_append_class-native() { |
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 deleted file mode 100644 index 2a318a4584..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | |||
3 | This patch adds the fix for one of the ciphers used in openssl, namely | ||
4 | the cipher des-ede3-cfb1. Complete bug log and patch is present here: | ||
5 | http://rt.openssl.org/Ticket/Display.html?id=2867 | ||
6 | |||
7 | Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | ||
8 | |||
9 | Index: openssl-1.0.2/crypto/evp/e_des3.c | ||
10 | =================================================================== | ||
11 | --- openssl-1.0.2.orig/crypto/evp/e_des3.c | ||
12 | +++ openssl-1.0.2/crypto/evp/e_des3.c | ||
13 | @@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH | ||
14 | size_t n; | ||
15 | unsigned char c[1], d[1]; | ||
16 | |||
17 | - for (n = 0; n < inl; ++n) { | ||
18 | + for (n = 0; n * 8 < inl; ++n) { | ||
19 | c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; | ||
20 | DES_ede3_cfb_encrypt(c, d, 1, 1, | ||
21 | &data(ctx)->ks1, &data(ctx)->ks2, | ||
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 deleted file mode 100644 index f736e5c098..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | openssl: avoid NULL pointer dereference in EVP_DigestInit_ex() | ||
2 | |||
3 | We should avoid accessing the type pointer if it's NULL, | ||
4 | this could happen if ctx->digest is not NULL. | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html | ||
8 | |||
9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> | ||
10 | --- | ||
11 | Index: openssl-1.0.2h/crypto/evp/digest.c | ||
12 | =================================================================== | ||
13 | --- openssl-1.0.2h.orig/crypto/evp/digest.c | ||
14 | +++ openssl-1.0.2h/crypto/evp/digest.c | ||
15 | @@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c | ||
16 | type = ctx->digest; | ||
17 | } | ||
18 | #endif | ||
19 | - if (ctx->digest != type) { | ||
20 | + if (type && (ctx->digest != type)) { | ||
21 | if (ctx->digest && ctx->digest->ctx_size) { | ||
22 | OPENSSL_free(ctx->md_data); | ||
23 | ctx->md_data = NULL; | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/parallel.patch b/meta/recipes-connectivity/openssl/openssl/parallel.patch index f3f4c99888..e5413bf389 100644 --- a/meta/recipes-connectivity/openssl/openssl/parallel.patch +++ b/meta/recipes-connectivity/openssl/openssl/parallel.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Fix the parallel races in the Makefiles. | 1 | From 7fb1192f112c1920bfd39f4185f34e9afff3cff2 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Sat, 5 Mar 2016 00:12:02 +0000 | ||
4 | Subject: [PATCH 24/28] Fix the parallel races in the Makefiles. | ||
2 | 5 | ||
3 | This patch was taken from the Gentoo packaging: | 6 | This patch was taken from the Gentoo packaging: |
4 | https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch | 7 | https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch |
@@ -9,9 +12,82 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
9 | Refreshed for 1.0.2i | 12 | Refreshed for 1.0.2i |
10 | Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | 13 | Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> |
11 | 14 | ||
12 | --- openssl-1.0.2g/crypto/Makefile | 15 | --- |
13 | +++ openssl-1.0.2g/crypto/Makefile | 16 | Makefile.org | 14 +- |
14 | @@ -85,11 +85,11 @@ | 17 | Makefile.org.orig | 10 +- |
18 | Makefile.shared | 2 + | ||
19 | Makefile.shared.orig | 655 ++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
20 | crypto/Makefile | 10 +- | ||
21 | engines/Makefile | 6 +- | ||
22 | engines/Makefile.orig | 338 ++++++++++++++++++++++++++ | ||
23 | test/Makefile | 92 +++---- | ||
24 | test/Makefile.orig | 88 ++++--- | ||
25 | 9 files changed, 1108 insertions(+), 107 deletions(-) | ||
26 | create mode 100644 Makefile.shared.orig | ||
27 | create mode 100644 engines/Makefile.orig | ||
28 | |||
29 | diff --git a/Makefile.org b/Makefile.org | ||
30 | index 8e7936c..ed98d2a 100644 | ||
31 | --- a/Makefile.org | ||
32 | +++ b/Makefile.org | ||
33 | @@ -283,17 +283,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc | ||
34 | build_libssl: build_ssl libssl.pc | ||
35 | |||
36 | build_crypto: | ||
37 | - @dir=crypto; target=all; $(BUILD_ONE_CMD) | ||
38 | + +@dir=crypto; target=all; $(BUILD_ONE_CMD) | ||
39 | build_ssl: build_crypto | ||
40 | - @dir=ssl; target=all; $(BUILD_ONE_CMD) | ||
41 | + +@dir=ssl; target=all; $(BUILD_ONE_CMD) | ||
42 | build_engines: build_crypto | ||
43 | - @dir=engines; target=all; $(BUILD_ONE_CMD) | ||
44 | + +@dir=engines; target=all; $(BUILD_ONE_CMD) | ||
45 | build_apps: build_libs | ||
46 | - @dir=apps; target=all; $(BUILD_ONE_CMD) | ||
47 | + +@dir=apps; target=all; $(BUILD_ONE_CMD) | ||
48 | build_tests: build_libs | ||
49 | - @dir=test; target=all; $(BUILD_ONE_CMD) | ||
50 | + +@dir=test; target=all; $(BUILD_ONE_CMD) | ||
51 | build_tools: build_libs | ||
52 | - @dir=tools; target=all; $(BUILD_ONE_CMD) | ||
53 | + +@dir=tools; target=all; $(BUILD_ONE_CMD) | ||
54 | |||
55 | all_testapps: build_libs build_testapps | ||
56 | build_testapps: | ||
57 | @@ -565,7 +565,7 @@ install_sw: | ||
58 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
59 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
60 | done; | ||
61 | - @set -e; target=install; $(RECURSIVE_BUILD_CMD) | ||
62 | + +@set -e; target=install; $(RECURSIVE_BUILD_CMD) | ||
63 | @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ | ||
64 | do \ | ||
65 | if [ -f "$$i" ]; then \ | ||
66 | diff --git a/Makefile.shared b/Makefile.shared | ||
67 | index f6f92e7..8164186 100644 | ||
68 | --- a/Makefile.shared | ||
69 | +++ b/Makefile.shared | ||
70 | @@ -105,6 +105,7 @@ LINK_SO= \ | ||
71 | SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ | ||
72 | LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ | ||
73 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ | ||
74 | + [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ | ||
75 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ | ||
76 | $${SHAREDCMD} $${SHAREDFLAGS} \ | ||
77 | -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ | ||
78 | @@ -122,6 +123,7 @@ SYMLINK_SO= \ | ||
79 | done; \ | ||
80 | fi; \ | ||
81 | if [ -n "$$SHLIB_SOVER" ]; then \ | ||
82 | + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ | ||
83 | ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ | ||
84 | ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ | ||
85 | fi; \ | ||
86 | diff --git a/crypto/Makefile b/crypto/Makefile | ||
87 | index 17a87f8..29c2dcf 100644 | ||
88 | --- a/crypto/Makefile | ||
89 | +++ b/crypto/Makefile | ||
90 | @@ -85,11 +85,11 @@ testapps: | ||
15 | @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi | 91 | @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi |
16 | 92 | ||
17 | subdirs: | 93 | subdirs: |
@@ -25,7 +101,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
25 | 101 | ||
26 | links: | 102 | links: |
27 | @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) | 103 | @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) |
28 | @@ -100,7 +100,7 @@ | 104 | @@ -100,7 +100,7 @@ links: |
29 | # lib: $(LIB): are splitted to avoid end-less loop | 105 | # lib: $(LIB): are splitted to avoid end-less loop |
30 | lib: $(LIB) | 106 | lib: $(LIB) |
31 | @touch lib | 107 | @touch lib |
@@ -34,7 +110,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
34 | $(AR) $(LIB) $(LIBOBJ) | 110 | $(AR) $(LIB) $(LIBOBJ) |
35 | test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o | 111 | test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o |
36 | $(RANLIB) $(LIB) || echo Never mind. | 112 | $(RANLIB) $(LIB) || echo Never mind. |
37 | @@ -111,7 +111,7 @@ | 113 | @@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs |
38 | fi | 114 | fi |
39 | 115 | ||
40 | libs: | 116 | libs: |
@@ -43,7 +119,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
43 | 119 | ||
44 | install: | 120 | install: |
45 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... | 121 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... |
46 | @@ -120,7 +120,7 @@ | 122 | @@ -120,7 +120,7 @@ install: |
47 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | 123 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
48 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | 124 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
49 | done; | 125 | done; |
@@ -52,9 +128,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
52 | 128 | ||
53 | lint: | 129 | lint: |
54 | @target=lint; $(RECURSIVE_MAKE) | 130 | @target=lint; $(RECURSIVE_MAKE) |
55 | --- openssl-1.0.2g/engines/Makefile | 131 | diff --git a/engines/Makefile b/engines/Makefile |
56 | +++ openssl-1.0.2g/engines/Makefile | 132 | index fe8e9ca..a43d21b 100644 |
57 | @@ -72,7 +72,7 @@ | 133 | --- a/engines/Makefile |
134 | +++ b/engines/Makefile | ||
135 | @@ -72,7 +72,7 @@ top: | ||
58 | 136 | ||
59 | all: lib subdirs | 137 | all: lib subdirs |
60 | 138 | ||
@@ -63,7 +141,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
63 | @if [ -n "$(SHARED_LIBS)" ]; then \ | 141 | @if [ -n "$(SHARED_LIBS)" ]; then \ |
64 | set -e; \ | 142 | set -e; \ |
65 | for l in $(LIBNAMES); do \ | 143 | for l in $(LIBNAMES); do \ |
66 | @@ -89,7 +89,7 @@ | 144 | @@ -89,7 +89,7 @@ lib: $(LIBOBJ) |
67 | 145 | ||
68 | subdirs: | 146 | subdirs: |
69 | echo $(EDIRS) | 147 | echo $(EDIRS) |
@@ -72,8 +150,8 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
72 | 150 | ||
73 | files: | 151 | files: |
74 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | 152 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
75 | @@ -128,7 +128,7 @@ | 153 | @@ -128,7 +128,7 @@ install: |
76 | mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ | 154 | mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \ |
77 | done; \ | 155 | done; \ |
78 | fi | 156 | fi |
79 | - @target=install; $(RECURSIVE_MAKE) | 157 | - @target=install; $(RECURSIVE_MAKE) |
@@ -81,62 +159,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
81 | 159 | ||
82 | tags: | 160 | tags: |
83 | ctags $(SRC) | 161 | ctags $(SRC) |
84 | --- openssl-1.0.2g/Makefile.org | 162 | diff --git a/test/Makefile b/test/Makefile |
85 | +++ openssl-1.0.2g/Makefile.org | 163 | index 40abd60..78d3788 100644 |
86 | @@ -279,17 +279,17 @@ | 164 | --- a/test/Makefile |
87 | build_libssl: build_ssl libssl.pc | 165 | +++ b/test/Makefile |
88 | 166 | @@ -145,7 +145,7 @@ install: | |
89 | build_crypto: | ||
90 | - @dir=crypto; target=all; $(BUILD_ONE_CMD) | ||
91 | + +@dir=crypto; target=all; $(BUILD_ONE_CMD) | ||
92 | build_ssl: build_crypto | ||
93 | - @dir=ssl; target=all; $(BUILD_ONE_CMD) | ||
94 | + +@dir=ssl; target=all; $(BUILD_ONE_CMD) | ||
95 | build_engines: build_crypto | ||
96 | - @dir=engines; target=all; $(BUILD_ONE_CMD) | ||
97 | + +@dir=engines; target=all; $(BUILD_ONE_CMD) | ||
98 | build_apps: build_libs | ||
99 | - @dir=apps; target=all; $(BUILD_ONE_CMD) | ||
100 | + +@dir=apps; target=all; $(BUILD_ONE_CMD) | ||
101 | build_tests: build_libs | ||
102 | - @dir=test; target=all; $(BUILD_ONE_CMD) | ||
103 | + +@dir=test; target=all; $(BUILD_ONE_CMD) | ||
104 | build_tools: build_libs | ||
105 | - @dir=tools; target=all; $(BUILD_ONE_CMD) | ||
106 | + +@dir=tools; target=all; $(BUILD_ONE_CMD) | ||
107 | |||
108 | all_testapps: build_libs build_testapps | ||
109 | build_testapps: | ||
110 | @@ -544,7 +544,7 @@ | ||
111 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
112 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
113 | done; | ||
114 | - @set -e; target=install; $(RECURSIVE_BUILD_CMD) | ||
115 | + +@set -e; target=install; $(RECURSIVE_BUILD_CMD) | ||
116 | @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ | ||
117 | do \ | ||
118 | if [ -f "$$i" ]; then \ | ||
119 | --- openssl-1.0.2g/Makefile.shared | ||
120 | +++ openssl-1.0.2g/Makefile.shared | ||
121 | @@ -105,6 +105,7 @@ | ||
122 | SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ | ||
123 | LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ | ||
124 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ | ||
125 | + [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ | ||
126 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ | ||
127 | $${SHAREDCMD} $${SHAREDFLAGS} \ | ||
128 | -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ | ||
129 | @@ -122,6 +123,7 @@ | ||
130 | done; \ | ||
131 | fi; \ | ||
132 | if [ -n "$$SHLIB_SOVER" ]; then \ | ||
133 | + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ | ||
134 | ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ | ||
135 | ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ | ||
136 | fi; \ | ||
137 | --- openssl-1.0.2g/test/Makefile | ||
138 | +++ openssl-1.0.2g/test/Makefile | ||
139 | @@ -144,7 +144,7 @@ | ||
140 | tags: | 167 | tags: |
141 | ctags $(SRC) | 168 | ctags $(SRC) |
142 | 169 | ||
@@ -145,7 +172,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
145 | 172 | ||
146 | apps: | 173 | apps: |
147 | @(cd ..; $(MAKE) DIRS=apps all) | 174 | @(cd ..; $(MAKE) DIRS=apps all) |
148 | @@ -438,136 +438,136 @@ | 175 | @@ -444,139 +444,139 @@ BUILD_CMD_STATIC=shlib_target=; \ |
149 | link_app.$${shlib_target} | 176 | link_app.$${shlib_target} |
150 | 177 | ||
151 | $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) | 178 | $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) |
@@ -316,6 +343,9 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
316 | - @target=$(BADDTLSTEST) $(BUILD_CMD) | 343 | - @target=$(BADDTLSTEST) $(BUILD_CMD) |
317 | + +@target=$(BADDTLSTEST) $(BUILD_CMD) | 344 | + +@target=$(BADDTLSTEST) $(BUILD_CMD) |
318 | 345 | ||
346 | $(FATALERRTEST)$(EXE_EXT): $(FATALERRTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) | ||
347 | @target=$(FATALERRTEST); exobj=ssltestlib.o; $(BUILD_CMD) | ||
348 | |||
319 | $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o | 349 | $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o |
320 | - @target=$(SSLV2CONFTEST) $(BUILD_CMD) | 350 | - @target=$(SSLV2CONFTEST) $(BUILD_CMD) |
321 | + +@target=$(SSLV2CONFTEST) $(BUILD_CMD) | 351 | + +@target=$(SSLV2CONFTEST) $(BUILD_CMD) |
@@ -326,7 +356,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
326 | 356 | ||
327 | #$(AESTEST).o: $(AESTEST).c | 357 | #$(AESTEST).o: $(AESTEST).c |
328 | # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c | 358 | # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c |
329 | @@ -580,6 +580,6 @@ | 359 | @@ -589,7 +589,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) |
330 | # fi | 360 | # fi |
331 | 361 | ||
332 | dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) | 362 | dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) |
@@ -334,4 +364,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
334 | + +@target=dummytest; $(BUILD_CMD) | 364 | + +@target=dummytest; $(BUILD_CMD) |
335 | 365 | ||
336 | # DO NOT DELETE THIS LINE -- make depend depends on it. | 366 | # DO NOT DELETE THIS LINE -- make depend depends on it. |
337 | \ No newline at end of file | 367 | |
368 | -- | ||
369 | 2.15.1 | ||
370 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb index 83d1a500c2..849f04b762 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb | |||
@@ -7,7 +7,7 @@ DEPENDS += "cryptodev-linux" | |||
7 | CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" | 7 | CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" |
8 | CFLAG_append_class-native = " -fPIC" | 8 | CFLAG_append_class-native = " -fPIC" |
9 | 9 | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=057d9218c6180e1d9ee407572b2dd225" |
11 | 11 | ||
12 | export DIRS = "crypto ssl apps engines" | 12 | export DIRS = "crypto ssl apps engines" |
13 | export OE_LDFLAGS="${LDFLAGS}" | 13 | export OE_LDFLAGS="${LDFLAGS}" |
@@ -32,8 +32,6 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \ | |||
32 | file://debian1.0.2/version-script.patch \ | 32 | file://debian1.0.2/version-script.patch \ |
33 | file://debian1.0.2/soname.patch \ | 33 | file://debian1.0.2/soname.patch \ |
34 | file://openssl_fix_for_x32.patch \ | 34 | file://openssl_fix_for_x32.patch \ |
35 | file://fix-cipher-des-ede3-cfb1.patch \ | ||
36 | file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ | ||
37 | file://openssl-fix-des.pod-error.patch \ | 35 | file://openssl-fix-des.pod-error.patch \ |
38 | file://Makefiles-ptest.patch \ | 36 | file://Makefiles-ptest.patch \ |
39 | file://ptest-deps.patch \ | 37 | file://ptest-deps.patch \ |
@@ -45,8 +43,8 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \ | |||
45 | file://Use-SHA256-not-MD5-as-default-digest.patch \ | 43 | file://Use-SHA256-not-MD5-as-default-digest.patch \ |
46 | file://0001-Fix-build-with-clang-using-external-assembler.patch \ | 44 | file://0001-Fix-build-with-clang-using-external-assembler.patch \ |
47 | " | 45 | " |
48 | SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65" | 46 | SRC_URI[md5sum] = "13bdc1b1d1ff39b6fd42a255e74676a4" |
49 | SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" | 47 | SRC_URI[sha256sum] = "370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe" |
50 | 48 | ||
51 | PACKAGES =+ "${PN}-engines" | 49 | PACKAGES =+ "${PN}-engines" |
52 | FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" | 50 | FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" |