mirror of
https://git.yoctoproject.org/poky
synced 2026-10-17 05:37:02 +00:00
openssl: update 1.0.2o -> 1.0.2p
Please see this security advisory: https://www.openssl.org/news/secadv/20180612.txt Refresh patches (From OE-Core rev: ff3db93e53c4f9d56807d3755c799459944e9a87) (From OE-Core rev: 84233553e963e26ca5f9f983662d4bd133176bb9) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
1 parent
45e1ed092d
commit
205a56fcfa
31 files changed
+28
-34
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
+7
-11
@@ -11,18 +11,15 @@ Signed-off-by: Maxin B. John <maxin.john@enea.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
Makefile.org | 10 +-
|
||||
Makefile.org.orig | 7 +-
|
||||
test/Makefile | 13 +-
|
||||
test/Makefile.orig | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 1009 insertions(+), 8 deletions(-)
|
||||
create mode 100644 test/Makefile.orig
|
||||
|
||||
Makefile.org | 10 +++++++++-
|
||||
test/Makefile | 13 +++++++++----
|
||||
2 files changed, 18 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.org b/Makefile.org
|
||||
index 111fbba..8e7936c 100644
|
||||
--- a/Makefile.org
|
||||
+++ b/Makefile.org
|
||||
@@ -468,8 +468,16 @@ rehash.time: certs apps
|
||||
@@ -467,8 +467,16 @@ rehash.time: certs apps
|
||||
test: tests
|
||||
|
||||
tests: rehash
|
||||
@@ -41,7 +38,7 @@ index 111fbba..8e7936c 100644
|
||||
|
||||
report:
|
||||
diff --git a/test/Makefile b/test/Makefile
|
||||
index a1f7eeb..b2984c4 100644
|
||||
index 55a6b50..d46b4d1 100644
|
||||
--- a/test/Makefile
|
||||
+++ b/test/Makefile
|
||||
@@ -150,7 +150,7 @@ tests: exe apps $(TESTS)
|
||||
@@ -55,7 +52,7 @@ index a1f7eeb..b2984c4 100644
|
||||
test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
|
||||
@@ -162,6 +162,11 @@ alltests: \
|
||||
test_constant_time test_verify_extra test_clienthello test_sslv2conftest \
|
||||
test_dtls test_bad_dtls test_fatalerr
|
||||
test_dtls test_bad_dtls test_fatalerr test_x509_time
|
||||
|
||||
+alltests:
|
||||
+ @(for i in $(all-tests); do \
|
||||
@@ -90,4 +87,3 @@ index a1f7eeb..b2984c4 100644
|
||||
|
||||
--
|
||||
2.15.1
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+19
-21
@@ -13,24 +13,18 @@ Refreshed for 1.0.2i
|
||||
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
|
||||
|
||||
---
|
||||
Makefile.org | 14 +-
|
||||
Makefile.org.orig | 10 +-
|
||||
Makefile.shared | 2 +
|
||||
Makefile.shared.orig | 655 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
crypto/Makefile | 10 +-
|
||||
engines/Makefile | 6 +-
|
||||
engines/Makefile.orig | 338 ++++++++++++++++++++++++++
|
||||
test/Makefile | 92 +++----
|
||||
test/Makefile.orig | 88 ++++---
|
||||
9 files changed, 1108 insertions(+), 107 deletions(-)
|
||||
create mode 100644 Makefile.shared.orig
|
||||
create mode 100644 engines/Makefile.orig
|
||||
Makefile.org | 14 ++--
|
||||
Makefile.shared | 2 +
|
||||
crypto/Makefile | 10 +--
|
||||
engines/Makefile | 6 +-
|
||||
test/Makefile | 94 +++++++++++-----------
|
||||
5 files changed, 64 insertions(+), 62 deletions(-)
|
||||
|
||||
diff --git a/Makefile.org b/Makefile.org
|
||||
index 8e7936c..ed98d2a 100644
|
||||
index efcfafb..82eab91 100644
|
||||
--- a/Makefile.org
|
||||
+++ b/Makefile.org
|
||||
@@ -283,17 +283,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc
|
||||
@@ -282,17 +282,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc
|
||||
build_libssl: build_ssl libssl.pc
|
||||
|
||||
build_crypto:
|
||||
@@ -54,7 +48,7 @@ index 8e7936c..ed98d2a 100644
|
||||
|
||||
all_testapps: build_libs build_testapps
|
||||
build_testapps:
|
||||
@@ -565,7 +565,7 @@ install_sw:
|
||||
@@ -564,7 +564,7 @@ install_sw:
|
||||
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
||||
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
||||
done;
|
||||
@@ -64,7 +58,7 @@ index 8e7936c..ed98d2a 100644
|
||||
do \
|
||||
if [ -f "$$i" ]; then \
|
||||
diff --git a/Makefile.shared b/Makefile.shared
|
||||
index f6f92e7..8164186 100644
|
||||
index bbefb2b..18013a9 100644
|
||||
--- a/Makefile.shared
|
||||
+++ b/Makefile.shared
|
||||
@@ -105,6 +105,7 @@ LINK_SO= \
|
||||
@@ -84,7 +78,7 @@ index f6f92e7..8164186 100644
|
||||
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
|
||||
fi; \
|
||||
diff --git a/crypto/Makefile b/crypto/Makefile
|
||||
index 17a87f8..29c2dcf 100644
|
||||
index 875ea1a..c22b683 100644
|
||||
--- a/crypto/Makefile
|
||||
+++ b/crypto/Makefile
|
||||
@@ -85,11 +85,11 @@ testapps:
|
||||
@@ -160,7 +154,7 @@ index fe8e9ca..a43d21b 100644
|
||||
tags:
|
||||
ctags $(SRC)
|
||||
diff --git a/test/Makefile b/test/Makefile
|
||||
index 40abd60..78d3788 100644
|
||||
index 36506cf..c69af8b 100644
|
||||
--- a/test/Makefile
|
||||
+++ b/test/Makefile
|
||||
@@ -145,7 +145,7 @@ install:
|
||||
@@ -172,7 +166,7 @@ index 40abd60..78d3788 100644
|
||||
|
||||
apps:
|
||||
@(cd ..; $(MAKE) DIRS=apps all)
|
||||
@@ -444,139 +444,139 @@ BUILD_CMD_STATIC=shlib_target=; \
|
||||
@@ -448,142 +448,142 @@ BUILD_CMD_STATIC=shlib_target=; \
|
||||
link_app.$${shlib_target}
|
||||
|
||||
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
|
||||
@@ -345,7 +339,11 @@ index 40abd60..78d3788 100644
|
||||
|
||||
$(FATALERRTEST)$(EXE_EXT): $(FATALERRTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
|
||||
@target=$(FATALERRTEST); exobj=ssltestlib.o; $(BUILD_CMD)
|
||||
|
||||
|
||||
$(X509TIMETEST)$(EXE_EXT): $(X509TIMETEST).o
|
||||
- @target=$(X509TIMETEST) $(BUILD_CMD)
|
||||
+ +@target=$(X509TIMETEST) $(BUILD_CMD)
|
||||
|
||||
$(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
|
||||
- @target=$(SSLV2CONFTEST) $(BUILD_CMD)
|
||||
+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
|
||||
@@ -356,7 +354,7 @@ index 40abd60..78d3788 100644
|
||||
|
||||
#$(AESTEST).o: $(AESTEST).c
|
||||
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
|
||||
@@ -589,7 +589,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
|
||||
@@ -596,7 +596,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
|
||||
# fi
|
||||
|
||||
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2
-2
@@ -53,8 +53,8 @@ SRC_URI_append_class-nativesdk = " \
|
||||
file://environment.d-openssl.sh \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "44279b8557c3247cbe324e2322ecd114"
|
||||
SRC_URI[sha256sum] = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d"
|
||||
SRC_URI[md5sum] = "ac5eb30bf5798aa14b1ae6d0e7da58df"
|
||||
SRC_URI[sha256sum] = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar"
|
||||
|
||||
Reference in new issue
Block a user