KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openssl: enable the use of cryptodev digests

Browse source 
SVN-Revision: 32673
This commit is contained in:
Luka Perkov 2012-07-11 23:38:16 +00:00
parent 283021ac15
commit f3112b06d2
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/kernel/modules/crypto.mk
View file

@ -393,7 +393,7 @@ $(eval $(call KernelPackage,crypto-misc))
define KernelPackage/crypto-ocf define KernelPackage/crypto-ocf
TITLE:=OCF modules TITLE:=OCF modules
DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml +kmod-crypto-manager DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @!TARGET_uml +kmod-crypto-manager
KCONFIG:= \ KCONFIG:= \
CONFIG_OCF_OCF \ CONFIG_OCF_OCF \
CONFIG_OCF_CRYPTODEV \ CONFIG_OCF_CRYPTODEV \
@ -417,7 +417,7 @@ $(eval $(call KernelPackage,crypto-ocf))
define KernelPackage/crypto-ocf-hifn7751 define KernelPackage/crypto-ocf-hifn7751
TITLE:=OCF support for Hifn 6500/7751/7811/795x, Invertex AEON and NetSec 7751 devices TITLE:=OCF support for Hifn 6500/7751/7811/795x, Invertex AEON and NetSec 7751 devices
DEPENDS:=+@OPENSSL_ENGINE @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf
KCONFIG:=CONFIG_OCF_HIFN KCONFIG:=CONFIG_OCF_HIFN
FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.ko FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.ko
AUTOLOAD:=$(call AutoLoad,10,hifn7751) AUTOLOAD:=$(call AutoLoad,10,hifn7751)
@ -429,7 +429,7 @@ $(eval $(call KernelPackage,crypto-ocf-hifn7751))
define KernelPackage/crypto-ocf-hifnhipp define KernelPackage/crypto-ocf-hifnhipp
TITLE:=OCF support for Hifn 7855/8155 devices TITLE:=OCF support for Hifn 7855/8155 devices
DEPENDS:=+@OPENSSL_ENGINE @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf
KCONFIG:=CONFIG_OCF_HIFNHIPP KCONFIG:=CONFIG_OCF_HIFNHIPP
FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.ko FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.ko
AUTOLOAD:=$(call AutoLoad,10,hifnHIPP) AUTOLOAD:=$(call AutoLoad,10,hifnHIPP)

7
package/openssl/Config.in
View file

@ -1,8 +1,13 @@
menu "Configuration" menu "Configuration"
depends on PACKAGE_libopenssl depends on PACKAGE_libopenssl
config OPENSSL_ENGINE config OPENSSL_ENGINE_CRYPTO
bool bool
prompt "Crypto acceleration support" prompt "Crypto acceleration support"
config OPENSSL_ENGINE_DIGEST
bool
depends OPENSSL_ENGINE_CRYPTO
prompt "Digests acceleration support"
endmenu endmenu

7
package/openssl/Makefile
View file

@ -19,7 +19,7 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
PKG_MD5SUM:=ae412727c8c15b67880aef7bd2999b2e PKG_MD5SUM:=ae412727c8c15b67880aef7bd2999b2e
PKG_BUILD_DEPENDS:=ocf-crypto-headers PKG_BUILD_DEPENDS:=ocf-crypto-headers
PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -76,8 +76,11 @@ OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \
no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5
OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2 OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2
ifdef CONFIG_OPENSSL_ENGINE ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
ifdef CONFIG_OPENSSL_ENGINE_DIGEST
OPENSSL_OPTIONS += -DUSE_CRYPTODEV_DIGESTS
endif
else else
OPENSSL_OPTIONS += no-engines OPENSSL_OPTIONS += no-engines
endif endif