projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openssl: update to 1.0.2f (fixes CVE-2016-0701, CVE-2015-3197)
[openwrt/staging/dedeckeh.git]
/
package
/
libs
/
openssl
/
Makefile
diff --git
a/package/libs/openssl/Makefile
b/package/libs/openssl/Makefile
index 2198920a63ea4dbcb8d2fe8248294403a2b19276..4ffff7d41a53c777ff480389a2b1c6e3eb18a411 100644
(file)
--- a/
package/libs/openssl/Makefile
+++ b/
package/libs/openssl/Makefile
@@
-8,7
+8,9
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
-PKG_VERSION:=1.0.2d
+PKG_BASE:=1.0.2
+PKG_BUGFIX:=f
+PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
@@
-16,9
+18,11
@@
PKG_BUILD_PARALLEL:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \
+ ftp://ftp.openssl.org/source/ \
+ http://www.openssl.org/source/old/$(PKG_BASE)/ \
ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \
ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
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:=
932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c
PKG_LICENSE:=OpenSSL
PKG_LICENSE_FILES:=LICENSE
PKG_LICENSE:=OpenSSL
PKG_LICENSE_FILES:=LICENSE
@@
-28,7
+32,8
@@
PKG_CONFIG_DEPENDS:= \
CONFIG_OPENSSL_ENGINE_DIGEST \
CONFIG_OPENSSL_WITH_EC \
CONFIG_OPENSSL_WITH_EC2M \
CONFIG_OPENSSL_ENGINE_DIGEST \
CONFIG_OPENSSL_WITH_EC \
CONFIG_OPENSSL_WITH_EC2M \
- CONFIG_OPENSSL_WITH_SSL3
+ CONFIG_OPENSSL_WITH_SSL3 \
+ CONFIG_OPENSSL_HARDWARE_SUPPORT
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
@@
-88,7
+93,7
@@
endef
OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia no-krb5
OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia no-krb5
-OPENSSL_OPTIONS:= shared no-err
no-hw
zlib-dynamic no-sse2 no-ssl2
+OPENSSL_OPTIONS:= shared no-err zlib-dynamic no-sse2 no-ssl2
ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
@@
-111,6
+116,10
@@
ifndef CONFIG_OPENSSL_WITH_SSL3
OPENSSL_OPTIONS += no-ssl3
endif
OPENSSL_OPTIONS += no-ssl3
endif
+ifndef CONFIG_OPENSSL_HARDWARE_SUPPORT
+ OPENSSL_OPTIONS += no-hw
+endif
+
ifeq ($(CONFIG_x86_64),y)
OPENSSL_TARGET:=linux-x86_64-openwrt
OPENSSL_MAKEFLAGS += LIBDIR=lib
ifeq ($(CONFIG_x86_64),y)
OPENSSL_TARGET:=linux-x86_64-openwrt
OPENSSL_MAKEFLAGS += LIBDIR=lib