cantyonion/opi-openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: add option to disable compression support

Browse Source 
By default it's disabled. After the CRIME attack it seems the use of
compression is discouraged.

Signed-off-by: Dirk Feytons <dirk.feytons@gmail.com>
This commit is contained in:
Dirk Feytons 2016-05-19 15:59:55 +02:00 committed by Felix Fietkau
parent db11695aa6
commit eb4fc91a81
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/libs/openssl/Config.in
View File

@ -20,6 +20,11 @@ config OPENSSL_WITH_DEPRECATED
default y default y
prompt "Include deprecated APIs" prompt "Include deprecated APIs"
config OPENSSL_WITH_COMPRESSION
bool
default n
prompt "Enable compression support"
config OPENSSL_ENGINE_DIGEST config OPENSSL_ENGINE_DIGEST
bool bool
depends on OPENSSL_ENGINE_CRYPTO depends on OPENSSL_ENGINE_CRYPTO

13
package/libs/openssl/Makefile
View File

@ -33,7 +33,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_OPENSSL_WITH_EC2M \ CONFIG_OPENSSL_WITH_EC2M \
CONFIG_OPENSSL_WITH_SSL3 \ CONFIG_OPENSSL_WITH_SSL3 \
CONFIG_OPENSSL_HARDWARE_SUPPORT \ CONFIG_OPENSSL_HARDWARE_SUPPORT \
CONFIG_OPENSSL_WITH_DEPRECATED CONFIG_OPENSSL_WITH_DEPRECATED \
CONFIG_OPENSSL_WITH_COMPRESSION
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -63,7 +64,7 @@ $(call Package/openssl/Default)
SECTION:=libs SECTION:=libs
SUBMENU:=SSL SUBMENU:=SSL
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+zlib DEPENDS:=+OPENSSL_WITH_COMPRESSION:zlib
TITLE+= (libraries) TITLE+= (libraries)
ABI_VERSION:=$(PKG_VERSION) ABI_VERSION:=$(PKG_VERSION)
MENU:=1 MENU:=1
@ -93,7 +94,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 zlib-dynamic no-sse2 no-ssl2 OPENSSL_OPTIONS:= shared no-err no-sse2 no-ssl2
ifdef CONFIG_OPENSSL_ENGINE_CRYPTO ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
@ -124,6 +125,12 @@ ifndef CONFIG_OPENSSL_WITH_DEPRECATED
OPENSSL_OPTIONS += no-deprecated OPENSSL_OPTIONS += no-deprecated
endif endif
ifdef CONFIG_OPENSSL_WITH_COMPRESSION
OPENSSL_OPTIONS += zlib-dynamic
else
OPENSSL_OPTIONS += no-comp
endif
ifeq ($(CONFIG_x86_64),y) ifeq ($(CONFIG_x86_64),y)
OPENSSL_TARGET:=linux-x86_64-openwrt OPENSSL_TARGET:=linux-x86_64-openwrt
OPENSSL_MAKEFLAGS += LIBDIR=lib OPENSSL_MAKEFLAGS += LIBDIR=lib