aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-10-30 13:11:04 +0000
committerSteven Barth <cyrus@openwrt.org>2014-10-30 13:11:04 +0000
commit6a4a437e0421a4b4beb38248c693b3fd321ef414 (patch)
tree9465dd4c7b5d0a0f104b68efbcb20650618659bd /package
parentd7e981ca4c6c04f441f78d76fbf02cdb69e647ab (diff)
downloadupstream-6a4a437e0421a4b4beb38248c693b3fd321ef414.tar.gz
upstream-6a4a437e0421a4b4beb38248c693b3fd321ef414.tar.bz2
upstream-6a4a437e0421a4b4beb38248c693b3fd321ef414.zip
openssl: optimize build options, disable old SSL versions
Based on a patchset by Etienne CHAMPETIER <champetier.etienne@gmail.com> Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 43123
Diffstat (limited to 'package')
-rw-r--r--package/libs/openssl/Config.in5
-rw-r--r--package/libs/openssl/Makefile19
2 files changed, 18 insertions, 6 deletions
diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in
index 34eff28338..b0a29c5e64 100644
--- a/package/libs/openssl/Config.in
+++ b/package/libs/openssl/Config.in
@@ -11,6 +11,11 @@ config OPENSSL_WITH_EC2M
depends on OPENSSL_WITH_EC
prompt "Enable ec2m support"
+config OPENSSL_WITH_SSL3
+ bool
+ default n
+ prompt "Enable sslv3 support"
+
config OPENSSL_ENGINE_CRYPTO
bool
prompt "Crypto acceleration support"
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index f95c25dabd..0130cb17e5 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
PKG_VERSION:=1.0.1j
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_USE_MIPS16:=0
PKG_BUILD_PARALLEL:=1
@@ -23,8 +23,12 @@ PKG_MD5SUM:=f7175c9cd3c39bb1907ac8bba9df8ed3
PKG_LICENSE:=SSLEAY OPENSSL
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=ocf-crypto-headers
-PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST \
- CONFIG_OPENSSL_WITH_EC CONFIG_OPENSSL_WITH_EC2M
+PKG_CONFIG_DEPENDS:= \
+ CONFIG_OPENSSL_ENGINE_CRYPTO \
+ CONFIG_OPENSSL_ENGINE_DIGEST \
+ CONFIG_OPENSSL_WITH_EC \
+ CONFIG_OPENSSL_WITH_EC2M \
+ CONFIG_OPENSSL_WITH_SSL3
include $(INCLUDE_DIR)/package.mk
@@ -83,9 +87,8 @@ This package contains the OpenSSL command-line utility.
endef
-OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \
- no-aes192 no-camellia no-ans1 no-krb5
-OPENSSL_OPTIONS:= shared no-err no-hw zlib-dynamic no-sse2
+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 no-cms
ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
@@ -104,6 +107,10 @@ ifndef CONFIG_OPENSSL_WITH_EC2M
OPENSSL_OPTIONS += no-ec2m
endif
+ifndef CONFIG_OPENSSL_WITH_SSL3
+ OPENSSL_OPTIONS += no-ssl3
+endif
+
ifeq ($(CONFIG_x86_64),y)
OPENSSL_TARGET:=linux-x86_64-openwrt
OPENSSL_MAKEFLAGS += LIBDIR=lib