aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-12-09 22:26:40 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-12-09 22:26:40 +0000
commitf1d3b08fc0c58d60b692bc1d5447f22de7074151 (patch)
tree05eb28f1e5d3f1482d4e000cfb7aaf34a3ce93c8
parent213b1e7105bc4577cff162e1d82eb3be2251ca0a (diff)
downloadupstream-f1d3b08fc0c58d60b692bc1d5447f22de7074151.tar.gz
upstream-f1d3b08fc0c58d60b692bc1d5447f22de7074151.tar.bz2
upstream-f1d3b08fc0c58d60b692bc1d5447f22de7074151.zip
openssl: add config option for no_hw support
The hardware support is required by some 3rd party engines (tpm) Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com> SVN-Revision: 47817
-rw-r--r--package/libs/openssl/Config.in5
-rw-r--r--package/libs/openssl/Makefile9
2 files changed, 12 insertions, 2 deletions
diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in
index b0a29c5e64..e2aa10dfd5 100644
--- a/package/libs/openssl/Config.in
+++ b/package/libs/openssl/Config.in
@@ -25,4 +25,9 @@ config OPENSSL_ENGINE_DIGEST
depends on OPENSSL_ENGINE_CRYPTO
prompt "Digests acceleration support"
+config OPENSSL_HARDWARE_SUPPORT
+ bool
+ default n
+ prompt "Enable hardware support"
+
endmenu
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index faf6816239..bbdd521379 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -29,7 +29,8 @@ PKG_CONFIG_DEPENDS:= \
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
@@ -89,7 +90,7 @@ endef
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
@@ -112,6 +113,10 @@ ifndef CONFIG_OPENSSL_WITH_SSL3
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