[source] openssl: add option to disable PSK support

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 23 03:15:23 PDT 2016


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=f16fc21675d3335061d7afeaff9c252f0fc7fd1e

commit f16fc21675d3335061d7afeaff9c252f0fc7fd1e
Author: Dirk Feytons <dirk.feytons at gmail.com>
AuthorDate: Fri May 20 17:23:28 2016 +0200

    openssl: add option to disable PSK support
    
    Signed-off-by: Dirk Feytons <dirk.feytons at gmail.com>
---
 package/libs/openssl/Config.in | 5 +++++
 package/libs/openssl/Makefile  | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in
index 492b042..7224b65 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 33b47aa..7cd306b 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



More information about the lede-commits mailing list