openssl: integrate variable cryptodev support

Allow openssl to use cryptodev-linux hardware crypto support besides
OCF.
To do this we remove the OCF option from openssl and automatically use
any of the available implementations when available.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 2187023e614470b3bc06bc5cb17be8e69f0b4e4d..d1ed5202780fa4496980b67a692a5183d82610fc 100644 (file)
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -23,18 +23,3 @@ config BR2_PACKAGE_OPENSSL_ENGINES
        depends on BR2_PACKAGE_OPENSSL
        help
          Install additional encryption engine libraries.
-
-config BR2_PACKAGE_OPENSSL_OCF
-       bool "openssl ocf support"
-       depends on BR2_PACKAGE_OPENSSL
-       select BR2_PACKAGE_OCF_LINUX
-       help
-         Enable openssl cryptodev (OCF) hardware acceleration support.
-         This requires the ocf linux kernel extension or you to provide a
-         pre-patched kernel that includes it.
-         If kernel support isn't available it'll just make the libraries
-         a tiny bit larger with a small CPU overhead when starting up and
-         checking for the required kernel-side support, and then falling
-         back to regular builtin support.
-
-         http://ocf-linux.sourceforge.net/

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 8486c448b693a0c7e33db70a67e5b89f168764a9..2e04789356d0b425ab0c91be5d1cb50f91b3c548 100644 (file)
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -22,7 +22,12 @@ endif
 
 OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
 
-ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
+ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
+       OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
+       OPENSSL_DEPENDENCIES += cryptodev-linux
+endif
+
+ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
        OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
        OPENSSL_DEPENDENCIES += ocf-linux
 endif