[package] 6in4: don't use abbreviated notation for 0.0.0.0/0, iproute apparently...

[openwrt.git] / package / kernel / modules / crypto.mk

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 1e15f45..9227deb 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -62,6 +62,7 @@ endef
 
 define KernelPackage/crypto-hw-padlock
   TITLE:=VIA PadLock ACE with AES/SHA hw crypto module
 
 define KernelPackage/crypto-hw-padlock
   TITLE:=VIA PadLock ACE with AES/SHA hw crypto module

+  DEPENDS:=+kmod-crypto-aes

   KCONFIG:= \
        CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_DEV_PADLOCK \
   KCONFIG:= \
        CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_DEV_PADLOCK \


@@ -266,7 +267,8 @@ define KernelPackage/crypto-misc
        $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \
        $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \
        $(LINUX_DIR)/crypto/tea.ko \
        $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \
        $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \
        $(LINUX_DIR)/crypto/tea.ko \

-       $(LINUX_DIR)/crypto/twofish.ko \
+       $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),,$(LINUX_DIR)/crypto/twofish.ko) \
+       $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)),,$(LINUX_DIR)/crypto/twofish_generic.ko) \

        $(LINUX_DIR)/crypto/wp512.ko
   $(call AddDepends/crypto)
 endef
        $(LINUX_DIR)/crypto/wp512.ko
   $(call AddDepends/crypto)
 endef


@@ -355,3 +357,20 @@ endef
 
 $(eval $(call KernelPackage,crypto-test))
 
 
 $(eval $(call KernelPackage,crypto-test))
 

+
+define KernelPackage/crypto-xts
+  TITLE:=XTS cipher CryptoAPI module
+  KCONFIG:= \
+       CONFIG_CRYPTO_GF128MUL \
+       CONFIG_CRYPTO_XTS
+  FILES:= \
+       $(LINUX_DIR)/crypto/xts.ko \
+       $(LINUX_DIR)/crypto/gf128mul.ko
+  AUTOLOAD:=$(call AutoLoad,09, \
+       gf128mul \
+       xts \
+  )
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-xts))