From: Dirk Feytons Date: Fri, 20 May 2016 15:23:28 +0000 (+0200) Subject: openssl: add option to disable PSK support X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f16fc21675d3335061d7afeaff9c252f0fc7fd1e;p=openwrt%2Fstaging%2Fwigyori.git openssl: add option to disable PSK support Signed-off-by: Dirk Feytons --- diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in index 492b042864..7224b65a4b 100644 --- a/package/libs/openssl/Config.in +++ b/package/libs/openssl/Config.in @@ -30,6 +30,11 @@ config OPENSSL_WITH_NPN default n prompt "Enable NPN support" +config OPENSSL_WITH_PSK + bool + default y + prompt "Enable PSK support" + config OPENSSL_ENGINE_DIGEST bool depends on OPENSSL_ENGINE_CRYPTO diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 33b47aa930..7cd306ba63 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -35,7 +35,8 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_OPENSSL_HARDWARE_SUPPORT \ CONFIG_OPENSSL_WITH_DEPRECATED \ CONFIG_OPENSSL_WITH_COMPRESSION \ - CONFIG_OPENSSL_WITH_NPN + CONFIG_OPENSSL_WITH_NPN \ + CONFIG_OPENSSL_WITH_PSK include $(INCLUDE_DIR)/package.mk @@ -136,6 +137,10 @@ ifndef CONFIG_OPENSSL_WITH_NPN OPENSSL_OPTIONS += no-nextprotoneg endif +ifndef CONFIG_OPENSSL_WITH_PSK + OPENSSL_OPTIONS += no-psk +endif + ifeq ($(CONFIG_x86_64),y) OPENSSL_TARGET:=linux-x86_64-openwrt OPENSSL_MAKEFLAGS += LIBDIR=lib