From b376105b79f42f1c39c3528336a674e442945bf4 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 7 Dec 2011 23:07:32 +0000 Subject: [PATCH] [backfire] openssl: update to v0.9.8r (CVE-2010-4180) git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29478 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/openssl/Makefile | 6 +++--- package/openssl/patches/110-optimize-for-size.patch | 4 ++-- package/openssl/patches/150-no_engines.patch | 2 +- package/openssl/patches/200-ocf-20100325.patch | 10 +++++----- package/openssl/patches/300-etrax_support.patch | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f9b4c0ac3..9ca2f574d 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=0.9.8p +PKG_VERSION:=0.9.8r PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \ ftp://ftp.webmonster.de/pub/openssl/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=7f24047f70364c9eabc94899e356ce39 +PKG_MD5SUM:=0352932ea863bc02b056cda7c9ac5b79 PKG_BUILD_DEPENDS:=ocf-crypto-headers PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE diff --git a/package/openssl/patches/110-optimize-for-size.patch b/package/openssl/patches/110-optimize-for-size.patch index ae35f50ce..9be06e6f0 100644 --- a/package/openssl/patches/110-optimize-for-size.patch +++ b/package/openssl/patches/110-optimize-for-size.patch @@ -7,5 +7,5 @@ +# OpenWrt targets +"linux-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - #### *BSD [do see comment about ${BSDthreads} above!] - "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # Android: Linux but without -DTERMIO and pointers to headers and libs. + "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch index ed34698a8..dcad330db 100644 --- a/package/openssl/patches/150-no_engines.patch +++ b/package/openssl/patches/150-no_engines.patch @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -1904,6 +1904,11 @@ EOF +@@ -1907,6 +1907,11 @@ EOF close(OUT); } diff --git a/package/openssl/patches/200-ocf-20100325.patch b/package/openssl/patches/200-ocf-20100325.patch index e53c447e4..d1dafb665 100644 --- a/package/openssl/patches/200-ocf-20100325.patch +++ b/package/openssl/patches/200-ocf-20100325.patch @@ -9,7 +9,7 @@ # # --test-sanity Make a number of sanity checks on the data in this file. # This is a debugging tool for OpenSSL developers. -@@ -554,6 +556,10 @@ my %table=( +@@ -557,6 +559,10 @@ my %table=( ##### Compaq Non-Stop Kernel (Tandem) "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", @@ -20,7 +20,7 @@ ); my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -@@ -610,6 +616,8 @@ my $montasm=1; # but "no-montasm" is d +@@ -613,6 +619,8 @@ my $montasm=1; # but "no-montasm" is d my $no_asm=0; my $no_dso=0; my $no_gmp=0; @@ -29,7 +29,7 @@ my @skip=(); my $Makefile="Makefile"; my $des_locl="crypto/des/des_locl.h"; -@@ -758,6 +766,14 @@ PROCESS_ARGS: +@@ -761,6 +769,14 @@ PROCESS_ARGS: { exit(&test_sanity()); } @@ -44,7 +44,7 @@ elsif (/^--strict-warnings/) { $strict_warnings = 1; -@@ -1055,6 +1071,7 @@ foreach (sort (keys %disabled)) +@@ -1058,6 +1074,7 @@ foreach (sort (keys %disabled)) print " OPENSSL_NO_$ALGO"; if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; } @@ -52,7 +52,7 @@ elsif (/^asm$/) { $no_asm = 1; } } else -@@ -1184,6 +1201,16 @@ if (!$no_krb5) +@@ -1187,6 +1204,16 @@ if (!$no_krb5) $withargs{"krb5-dir"} ne ""; } diff --git a/package/openssl/patches/300-etrax_support.patch b/package/openssl/patches/300-etrax_support.patch index 74c9442d5..ca2a909bf 100644 --- a/package/openssl/patches/300-etrax_support.patch +++ b/package/openssl/patches/300-etrax_support.patch @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -403,6 +403,10 @@ my %table=( +@@ -406,6 +406,10 @@ my %table=( "QNX6", "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "QNX6-i386", "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -- 2.35.1