Changeset 47727

Timestamp:

2015-12-03T22:08:28+01:00 (2 years ago)

Author:

hauke

Message:

CC: openssl: update to version 1.0.2e

backport of r47726.

This fixes the following security problems:

• CVE-2015-3193
• CVE-2015-3194
• CVE-2015-3195)

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:

branches/chaos_calmer/package/libs/openssl

Files:

• Makefile (modified) (2 diffs)
• patches/110-optimize-for-size.patch (modified) (1 diff)
• patches/150-no_engines.patch (modified) (1 diff)
• patches/160-disable_doc_tests.patch (modified) (3 diffs)
• patches/190-remove_timestamp_check.patch (modified) (1 diff)
• patches/200-parallel_build.patch (modified) (7 diffs)

branches/chaos_calmer/package/libs/openssl/Makefile

@@ -9 +9 @@
 
 PKG_NAME:=openssl
-PKG_VERSION:=1.0.2d
+PKG_VERSION:=1.0.2e
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
@@ -19 +19 @@
         ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \
         ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
-PKG_MD5SUM:=38dd619b2e77cbac69b99f52a053d25a
+PKG_MD5SUM:=5262bfa25b60ed9de9f28d5d52d77fc5
 
 PKG_LICENSE:=OpenSSL

branches/chaos_calmer/package/libs/openssl/patches/110-optimize-for-size.patch

@@ -1 +1 @@
 --- a/Configure
 +++ b/Configure
-@@ -460,6 +460,12 @@ my %table=(
+@@ -461,6 +461,12 @@ my %table=(
  "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",

branches/chaos_calmer/package/libs/openssl/patches/150-no_engines.patch

@@ -1 +1 @@
 --- a/Configure
 +++ b/Configure
-@@ -2103,6 +2103,11 @@ EOF
+@@ -2106,6 +2106,11 @@ EOF
         close(OUT);
    }

branches/chaos_calmer/package/libs/openssl/patches/160-disable_doc_tests.patch

@@ -28 +28 @@
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -272,7 +272,7 @@ reflect:
+@@ -274,7 +274,7 @@ reflect:
  
  sub_all: build_all
@@ -37 +37 @@
  build_libs: build_libcrypto build_libssl openssl.pc
  
-@@ -529,7 +529,7 @@ dist:
+@@ -534,7 +534,7 @@ dist:
  dist_pem_h:
         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -48 +48 @@
 --- a/Makefile.org
 +++ b/Makefile.org
-@@ -527,7 +527,7 @@ dist:
+@@ -532,7 +532,7 @@ dist:
  dist_pem_h:
         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)

branches/chaos_calmer/package/libs/openssl/patches/190-remove_timestamp_check.patch

@@ -10 +10 @@
  # as we stick to -e, CLEARENV ensures that local variables in lower
  # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
-@@ -399,11 +399,6 @@ openssl.pc: Makefile
+@@ -401,11 +401,6 @@ openssl.pc: Makefile
             echo 'Version: '$(VERSION); \
             echo 'Requires: libssl libcrypto' ) > openssl.pc

branches/chaos_calmer/package/libs/openssl/patches/200-parallel_build.patch

@@ -1 +1 @@
 --- a/Makefile.org
 +++ b/Makefile.org
-@@ -278,17 +278,17 @@ build_libcrypto: build_crypto build_engi
+@@ -280,17 +280,17 @@ build_libcrypto: build_crypto build_engi
  build_libssl: build_ssl libssl.pc
  
@@ -25 +25 @@
  all_testapps: build_libs build_testapps
  build_testapps:
-@@ -460,7 +460,7 @@ update: errors stacks util/libeay.num ut
+@@ -462,7 +462,7 @@ update: errors stacks util/libeay.num ut
         @set -e; target=update; $(RECURSIVE_BUILD_CMD)
  
@@ -34 +34 @@
  lint:
         @set -e; target=lint; $(RECURSIVE_BUILD_CMD)
-@@ -522,9 +522,9 @@ dist:
+@@ -527,9 +527,9 @@ dist:
  dist_pem_h:
         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -46 +46 @@
                 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
                 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -533,12 +533,19 @@ install_sw:
+@@ -538,12 +538,19 @@ install_sw:
                 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
                 $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
@@ -67 +67 @@
         do \
                 if [ -f "$$i" ]; then \
-@@ -622,12 +629,7 @@ install_html_docs:
+@@ -627,12 +634,7 @@ install_html_docs:
                 done; \
         done
@@ -165 +165 @@
 --- a/test/Makefile
 +++ b/test/Makefile
-@@ -134,7 +134,7 @@ install:
+@@ -138,7 +138,7 @@ install:
  tags:
         ctags $(SRC)
@@ -174 +174 @@
  apps:
         @(cd ..; $(MAKE) DIRS=apps all)
-@@ -538,7 +538,7 @@ $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEX
+@@ -549,7 +549,7 @@ $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHE
  #      fi