Commit fb6b39b7 authored by jow's avatar jow

BB: openssl: update to v1.0.1j (CVE-2014-3513, CVE-2014-3567, CVE-2014-3568)

Also refresh patches and bump copyright year in Makefile.
Signed-off-by: default avatarJo-Philipp Wich <jow@openwrt.org>

Backport of r42929

git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42930 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent 513aa9c9
# #
# Copyright (C) 2006-2012 OpenWrt.org # Copyright (C) 2006-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=openssl PKG_NAME:=openssl
PKG_VERSION:=1.0.1i PKG_VERSION:=1.0.1j
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
...@@ -18,7 +18,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ...@@ -18,7 +18,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \
ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
PKG_MD5SUM:=c8dc151a671b9b92ff3e4c118b174972 PKG_MD5SUM:=f7175c9cd3c39bb1907ac8bba9df8ed3
PKG_LICENSE:=SSLEAY OPENSSL PKG_LICENSE:=SSLEAY OPENSSL
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
......
--- a/Configure --- a/Configure
+++ b/Configure +++ b/Configure
@@ -2004,6 +2004,11 @@ EOF @@ -2011,6 +2011,11 @@ EOF
close(OUT); close(OUT);
} }
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
fi; \ fi; \
--- a/crypto/Makefile --- a/crypto/Makefile
+++ b/crypto/Makefile +++ b/crypto/Makefile
@@ -88,11 +88,11 @@ testapps: @@ -90,11 +90,11 @@ testapps:
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
subdirs: subdirs:
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
links: links:
@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
@@ -103,7 +103,7 @@ links: @@ -105,7 +105,7 @@ links:
# lib: $(LIB): are splitted to avoid end-less loop # lib: $(LIB): are splitted to avoid end-less loop
lib: $(LIB) lib: $(LIB)
@touch lib @touch lib
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
$(AR) $(LIB) $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ)
[ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
$(RANLIB) $(LIB) || echo Never mind. $(RANLIB) $(LIB) || echo Never mind.
@@ -114,7 +114,7 @@ shared: buildinf.h lib subdirs @@ -116,7 +116,7 @@ shared: buildinf.h lib subdirs
fi fi
libs: libs:
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
install: install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@@ -123,7 +123,7 @@ install: @@ -125,7 +125,7 @@ install:
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
done; done;
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
ctags $(SRC) ctags $(SRC)
--- a/test/Makefile --- a/test/Makefile
+++ b/test/Makefile +++ b/test/Makefile
@@ -124,7 +124,7 @@ install: @@ -129,7 +129,7 @@ install:
tags: tags:
ctags $(SRC) ctags $(SRC)
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
apps: apps:
@(cd ..; $(MAKE) DIRS=apps all) @(cd ..; $(MAKE) DIRS=apps all)
@@ -365,109 +365,109 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$ @@ -384,109 +384,109 @@ BUILD_CMD_STATIC=shlib_target=; \
link_app.$${shlib_target} link_app.$${shlib_target}
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
...@@ -321,9 +321,9 @@ ...@@ -321,9 +321,9 @@
- @target=$(SRPTEST); $(BUILD_CMD) - @target=$(SRPTEST); $(BUILD_CMD)
+ +@target=$(SRPTEST); $(BUILD_CMD) + +@target=$(SRPTEST); $(BUILD_CMD)
#$(AESTEST).o: $(AESTEST).c $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
@@ -480,7 +480,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLI @@ -505,7 +505,7 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMET
# fi # fi
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment