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

rework workarounds for crypto modules renamed in 2.6.24 & 2.6.25, add workaround for sha512 renamed in 2.6.26

Browse source 
SVN-Revision: 12098
This commit is contained in:
Nicolas Thill 2008-08-04 16:59:16 +00:00
parent 7b831cd3fe
commit 4c195465a8
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,19 +8,26 @@
CRYPTO_MENU:=Cryptographic API modules CRYPTO_MENU:=Cryptographic API modules
# XXX: added CRYPTO_GENERIC as a workaround for modules renamed in 2.6.24: # XXX: added workarounds for modules renamed in 2.6 series:
# - aes > aes_generic # - aes > aes_generic (2.6.24)
# - des > des_generic # - blkcipher -> crypto_blkcipher (2.6.25)
# - sha1 > sha1_generic # - des > des_generic (2.6.24)
# - sha256 > sha256_generic # - sha1 > sha1_generic (2.6.24)
# - sha256 > sha256_generic (2.6.24)
# - sha512 > sha512_generic (2.6.26)
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
CRYPTO_GENERIC:=_generic CRYPTO_GENERIC:=_generic
AES_SUFFIX:=$(CRYPTO_GENERIC)
DES_SUFFIX:=$(CRYPTO_GENERIC)
SHA1_SUFFIX:=$(CRYPTO_GENERIC)
SHA256_SUFFIX:=$(CRYPTO_GENERIC)
endif endif
# XXX: added CRYPTO_PREFIX as a workaround for modules renamed in 2.6.25:
# - blkcipher -> crypto_blkcipher
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
CRYPTO_PREFIX:=crypto_ CRYPTO_PREFIX:=crypto_
BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX)
endif
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
SHA512_SUFFIX:=$(CRYPTO_GENERIC)
endif endif
# XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is # XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is
@ -40,7 +47,7 @@ define KernelPackage/crypto-core
CONFIG_CRYPTO_MANAGER CONFIG_CRYPTO_MANAGER
FILES:= \ FILES:= \
$(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/$(CRYPTO_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/$(BLKCIPHER_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \
@ -50,7 +57,7 @@ define KernelPackage/crypto-core
crypto_algapi \ crypto_algapi \
cryptomgr \ cryptomgr \
crypto_hash \ crypto_hash \
$(CRYPTO_PREFIX)blkcipher \ $(BLKCIPHER_PREFIX)blkcipher \
cbc \ cbc \
ecb \ ecb \
deflate \ deflate \
@ -72,8 +79,8 @@ define KernelPackage/crypto-aes
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_AES \ CONFIG_CRYPTO_AES \
CONFIG_CRYPTO_AES_586 CONFIG_CRYPTO_AES_586
FILES:=$(LINUX_DIR)/crypto/aes$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,09,aes$(CRYPTO_GENERIC)) AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX))
endef endef
define KernelPackage/crypto-aes/x86-2.6 define KernelPackage/crypto-aes/x86-2.6
@ -124,8 +131,8 @@ define KernelPackage/crypto-des
TITLE:=DES/3DES cipher CryptoAPI module TITLE:=DES/3DES cipher CryptoAPI module
DEPENDS:=+kmod-crypto-core DEPENDS:=+kmod-crypto-core
KCONFIG:=CONFIG_CRYPTO_DES KCONFIG:=CONFIG_CRYPTO_DES
FILES:=$(LINUX_DIR)/crypto/des$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,09,des$(CRYPTO_GENERIC)) AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX))
endef endef
$(eval $(call KernelPackage,crypto-des)) $(eval $(call KernelPackage,crypto-des))
@ -172,8 +179,8 @@ define KernelPackage/crypto-sha1
TITLE:=SHA1 digest CryptoAPI module TITLE:=SHA1 digest CryptoAPI module
DEPENDS:=+kmod-crypto-core DEPENDS:=+kmod-crypto-core
KCONFIG:=CONFIG_CRYPTO_SHA1 KCONFIG:=CONFIG_CRYPTO_SHA1
FILES:=$(LINUX_DIR)/crypto/sha1$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,09,sha1$(CRYPTO_GENERIC)) AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX))
endef endef
$(eval $(call KernelPackage,crypto-sha1)) $(eval $(call KernelPackage,crypto-sha1))
@ -209,8 +216,8 @@ define KernelPackage/crypto-misc
$(LINUX_DIR)/crypto/khazad.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/khazad.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/md4.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/md4.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/serpent.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/serpent.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/sha256$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/sha512.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX)