Commit c714dba5 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

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: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 6235f682

package/openssl/Config.in

+0 −15
Original line number Diff line number Diff line
@@ -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/

package/openssl/openssl.mk

+6 −1
Original line number Diff line number Diff line
@@ -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