Changeset 43889

Timestamp:

2015-01-09T01:10:55+01:00 (3 years ago)

Author:

jow

Message:

BB: openssl: update to v1.0.1k (8 CVEs)

Fixes CVE-2014-3571, CVE-2015-0206, CVE-2014-3569, CVE-2014-3572,
CVE-2015-0204, CVE-2015-0205, CVE-2014-8275 and CVE-2014-3570.

Signed-off-by: Jo-Philipp Wich <jow@…>

Location:

branches/barrier_breaker/package/libs/openssl

Files:

• Makefile (modified) (3 diffs)
• patches/150-no_engines.patch (modified) (9 diffs)
• patches/200-parallel_build.patch (modified) (4 diffs)

branches/barrier_breaker/package/libs/openssl/Makefile

@@ -1 +1 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9 +9 @@
 
 PKG_NAME:=openssl
-PKG_VERSION:=1.0.1j
+PKG_VERSION:=1.0.1k
 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:=f7175c9cd3c39bb1907ac8bba9df8ed3
+PKG_MD5SUM:=d4f002bd22a56881340105028842ae1f
 
 PKG_LICENSE:=SSLEAY OPENSSL

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

@@ -1 +1 @@
 --- a/Configure
 +++ b/Configure
-@@ -2011,6 +2011,11 @@ EOF
+@@ -2016,6 +2016,11 @@ EOF
         close(OUT);
    }
@@ -15 +15 @@
 --- a/util/libeay.num
 +++ b/util/libeay.num
-@@ -2071,7 +2071,6 @@ PKCS7_ATTR_SIGN_it
+@@ -2072,7 +2072,6 @@ PKCS7_ATTR_SIGN_it
  UI_add_error_string                     2633   EXIST::FUNCTION:
  KRB5_CHECKSUM_free                      2634   EXIST::FUNCTION:
@@ -23 +23 @@
  PKEY_USAGE_PERIOD_it                    2638   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
  PKEY_USAGE_PERIOD_it                    2638   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-@@ -2545,7 +2544,6 @@ OCSP_RESPONSE_new
+@@ -2546,7 +2545,6 @@ OCSP_RESPONSE_new
  AES_set_encrypt_key                     3024   EXIST::FUNCTION:AES
  OCSP_resp_count                         3025   EXIST::FUNCTION:
@@ -31 +31 @@
  ENGINE_set_default_ciphers              3029   EXIST::FUNCTION:ENGINE
  NOTICEREF_it                            3030   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-@@ -2576,7 +2574,6 @@ ASN1_primitive_free
+@@ -2577,7 +2575,6 @@ ASN1_primitive_free
  i2d_EXTENDED_KEY_USAGE                  3052   EXIST::FUNCTION:
  i2d_OCSP_SIGNATURE                      3053   EXIST::FUNCTION:
@@ -39 +39 @@
  PKCS12_MAC_DATA_it                      3057   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
  PKCS12_MAC_DATA_it                      3057   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-@@ -2600,7 +2597,6 @@ asn1_get_choice_selector
+@@ -2601,7 +2598,6 @@ asn1_get_choice_selector
  i2d_KRB5_CHECKSUM                       3072   EXIST::FUNCTION:
  ENGINE_set_table_flags                  3073   EXIST::FUNCTION:ENGINE
@@ -47 +47 @@
  OCSP_BASICRESP_new                      3077   EXIST::FUNCTION:
  OCSP_REQUEST_get_ext_by_NID             3078   EXIST::FUNCTION:
-@@ -2667,7 +2663,6 @@ OCSP_CRLID_it
+@@ -2668,7 +2664,6 @@ OCSP_CRLID_it
  OCSP_CRLID_it                           3127   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
  i2d_KRB5_AUTHENTBODY                    3128   EXIST::FUNCTION:
@@ -55 +55 @@
  X509_NAME_it                            3131   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
  USERNOTICE_it                           3132   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-@@ -2762,8 +2757,6 @@ DES_read_2passwords
+@@ -2763,8 +2758,6 @@ DES_read_2passwords
  DES_read_password                       3207   EXIST::FUNCTION:DES
  UI_UTIL_read_pw                         3208   EXIST::FUNCTION:
@@ -64 +64 @@
  OPENSSL_add_all_algo_noconf             3212   EXIST:VMS:FUNCTION:
  OPENSSL_add_all_algorithms_conf         3213   EXIST:!VMS:FUNCTION:
-@@ -2772,7 +2765,6 @@ OPENSSL_load_builtin_modules
+@@ -2773,7 +2766,6 @@ OPENSSL_load_builtin_modules
  AES_ofb128_encrypt                      3215   EXIST::FUNCTION:AES
  AES_ctr128_encrypt                      3216   EXIST::FUNCTION:AES
@@ -72 +72 @@
  EVP_aes_256_ofb                         3220   EXIST::FUNCTION:AES
  EVP_aes_192_ofb                         3221   EXIST::FUNCTION:AES
-@@ -3107,7 +3099,6 @@ EC_GFp_nist_method
+@@ -3108,7 +3100,6 @@ EC_GFp_nist_method
  STORE_meth_set_modify_fn                3530   NOEXIST::FUNCTION:
  STORE_method_set_modify_function        3530   NOEXIST::FUNCTION:

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

@@ -98 +98 @@
 --- a/crypto/Makefile
 +++ b/crypto/Makefile
-@@ -90,11 +90,11 @@ testapps:
+@@ -85,11 +85,11 @@ testapps:
         @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
  
@@ -112 +112 @@
  links:
         @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -105,7 +105,7 @@ links:
+@@ -100,7 +100,7 @@ links:
  # lib: $(LIB): are splitted to avoid end-less loop
  lib:   $(LIB)
@@ -121 +121 @@
         [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
         $(RANLIB) $(LIB) || echo Never mind.
-@@ -116,7 +116,7 @@ shared: buildinf.h lib subdirs
+@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs
         fi
  
@@ -130 +130 @@
  install:
         @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -125,7 +125,7 @@ install:
+@@ -120,7 +120,7 @@ install:
         (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \