projects
/
oweals
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4dc65ae
)
move aead into crypto-core
author
Imre Kaloz
<kaloz@openwrt.org>
Wed, 10 Dec 2008 18:43:42 +0000
(18:43 +0000)
committer
Imre Kaloz
<kaloz@openwrt.org>
Wed, 10 Dec 2008 18:43:42 +0000
(18:43 +0000)
SVN-Revision: 13584
package/kernel/modules/crypto.mk
patch
|
blob
|
history
diff --git
a/package/kernel/modules/crypto.mk
b/package/kernel/modules/crypto.mk
index af268088d05cc85be4fb047e9e78d625533551c2..860eeed145dcd7c1b91a609f6c0f4d49f6a236b9 100644
(file)
--- a/
package/kernel/modules/crypto.mk
+++ b/
package/kernel/modules/crypto.mk
@@
-37,6
+37,7
@@
define KernelPackage/crypto-core
TITLE:=Core CryptoAPI modules
KCONFIG:= \
CONFIG_CRYPTO=y \
TITLE:=Core CryptoAPI modules
KCONFIG:= \
CONFIG_CRYPTO=y \
+ CONFIG_CRYPTO_AEAD \
CONFIG_CRYPTO_ALGAPI \
CONFIG_CRYPTO_BLKCIPHER \
CONFIG_CRYPTO_CBC \
CONFIG_CRYPTO_ALGAPI \
CONFIG_CRYPTO_BLKCIPHER \
CONFIG_CRYPTO_CBC \
@@
-47,6
+48,7
@@
define KernelPackage/crypto-core
CONFIG_CRYPTO_MANAGER
FILES:= \
$(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
CONFIG_CRYPTO_MANAGER
FILES:= \
$(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/crypto/aead.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/$(BLKCIPHER_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/$(BLKCIPHER_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
@@
-123,8
+125,7
@@
define KernelPackage/crypto-hw-ixp4xx
SUBMENU:=$(CRYPTO_MENU)
TITLE:=Intel IXP4xx hardware crypto module
DEPENDS:= \
SUBMENU:=$(CRYPTO_MENU)
TITLE:=Intel IXP4xx hardware crypto module
DEPENDS:= \
- @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-aead \
- +kmod-crypto-authenc
+ @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-authenc
KCONFIG:= CONFIG_CRYPTO_DEV_IXP4XX
FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
KCONFIG:= CONFIG_CRYPTO_DEV_IXP4XX
FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
@@
-167,21
+168,10
@@
endef
$(eval $(call KernelPackage,crypto-arc4))
$(eval $(call KernelPackage,crypto-arc4))
-define KernelPackage/crypto-aead
- SUBMENU:=$(CRYPTO_MENU)
- TITLE:=Authenticated Encryption with Associated Data
- DEPENDS:=+kmod-crypto-core
- KCONFIG:=CONFIG_CRYPTO_AEAD
- FILES:=$(LINUX_DIR)/crypto/aead.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,09,aead)
-endef
-
-$(eval $(call KernelPackage,crypto-aead))
-
define KernelPackage/crypto-authenc
SUBMENU:=$(CRYPTO_MENU)
TITLE:=Combined mode wrapper for IPsec
define KernelPackage/crypto-authenc
SUBMENU:=$(CRYPTO_MENU)
TITLE:=Combined mode wrapper for IPsec
- DEPENDS:=+kmod-crypto-core
+kmod-crypto-aead
+ DEPENDS:=+kmod-crypto-core
KCONFIG:=CONFIG_CRYPTO_AUTHENC
FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,09,authenc)
KCONFIG:=CONFIG_CRYPTO_AUTHENC
FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,09,authenc)