Pārlūkot izejas kodu

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)

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Andrej Valek 6 gadi atpakaļ
vecāks
revīzija
06b5355b9d
31 mainītis faili ar 28 papildinājumiem un 34 dzēšanām
  1. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-Fix-build-with-clang-using-external-assembler.patch
  2. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-allow-manpages-to-be-disabled.patch
  3. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-openssl-force-soft-link-to-avoid-rare-race.patch
  4. 7 11
      meta/recipes-connectivity/openssl/openssl-1.0.2p/Makefiles-ptest.patch
  5. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/Use-SHA256-not-MD5-as-default-digest.patch
  6. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-musl-target.patch
  7. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-targets.patch
  8. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch
  9. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch
  10. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch
  11. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch
  12. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch
  13. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch
  14. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch
  15. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_digicert_malaysia.patch
  16. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_diginotar.patch
  17. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/soname.patch
  18. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/version-script.patch
  19. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/engines-install-in-libdir-ssl.patch
  20. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/oe-ldflags.patch
  21. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-c_rehash.sh
  22. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-fix-des.pod-error.patch
  23. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl_fix_for_x32.patch
  24. 19 21
      meta/recipes-connectivity/openssl/openssl-1.0.2p/parallel.patch
  25. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest-deps.patch
  26. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest_makefile_deps.patch
  27. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-cflags.patch
  28. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-mkbuildinf.patch
  29. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/run-ptest
  30. 0 0
      meta/recipes-connectivity/openssl/openssl-1.0.2p/shared-libs.patch
  31. 2 2
      meta/recipes-connectivity/openssl/openssl_1.0.2p.bb

+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-Fix-build-with-clang-using-external-assembler.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-allow-manpages-to-be-disabled.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-openssl-force-soft-link-to-avoid-rare-race.patch


+ 7 - 11
meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/Makefiles-ptest.patch

@@ -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
-

+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/Use-SHA256-not-MD5-as-default-digest.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-musl-target.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-targets.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_digicert_malaysia.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_diginotar.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/soname.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/version-script.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/engines-install-in-libdir-ssl.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/oe-ldflags.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh → meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-c_rehash.sh


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-fix-des.pod-error.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl_fix_for_x32.patch


+ 19 - 21
meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/parallel.patch

@@ -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)

+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest-deps.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest_makefile_deps.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-cflags.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-mkbuildinf.patch


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest → meta/recipes-connectivity/openssl/openssl-1.0.2p/run-ptest


+ 0 - 0
meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch → meta/recipes-connectivity/openssl/openssl-1.0.2p/shared-libs.patch


+ 2 - 2
meta/recipes-connectivity/openssl/openssl_1.0.2o.bb → meta/recipes-connectivity/openssl/openssl_1.0.2p.bb

@@ -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"