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

diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in
index b0a29c5e643a9518445349bde5dfe1c66a41b138..e2aa10dfd5cad382a6d218205adcc39e9d119c30 100644 (file)
--- 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 faf68162397f6c27dd1d4ac1373680dd7a9c22e8..bbdd521379ffa665930a8f063ac969bb86d16320 100644 (file)
--- 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