kernel: cleanup crypto stuff and fix module names on 2.4

SVN-Revision: 19058
This commit is contained in:
Nicolas Thill 2010-01-06 18:50:38 +00:00
parent 04ba8ab358
commit 6769fc65bb

View file

@ -14,35 +14,22 @@ CRYPTO_MENU:=Cryptographic API modules
# - sha1 > sha1_generic (2.6.24)
# - sha256 > sha256_generic (2.6.24)
# - sha512 > sha512_generic (2.6.26)
CRYPTO_GENERIC:=_generic
AES_SUFFIX:=$(CRYPTO_GENERIC)
DES_SUFFIX:=$(CRYPTO_GENERIC)
SHA1_SUFFIX:=$(CRYPTO_GENERIC)
SHA256_SUFFIX:=$(CRYPTO_GENERIC)
SHA512_SUFFIX:=$(CRYPTO_GENERIC)
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
CRYPTO_PREFIX:=crypto_
BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX)
endif
AEAD_CONF:=AEAD
MANAGER_CONF:=MANAGER
BLKCIPHER_CONF:=BLKCIPHER
HASH_CONF:=HASH
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
CRYPTO_MODULE_PCOMPRESS:=PCOMP=pcompress
AEAD_CONF:=AEAD2
MANAGER_CONF:=MANAGER2
BLKCIPHER_CONF:=BLKCIPHER2
HASH_CONF:=HASH2
ifneq ($(CONFIG_LINUX_2_6),)
CRYPTO_GENERIC:=_generic
AES_SUFFIX:=$(CRYPTO_GENERIC)
DES_SUFFIX:=$(CRYPTO_GENERIC)
SHA1_SUFFIX:=$(CRYPTO_GENERIC)
SHA256_SUFFIX:=$(CRYPTO_GENERIC)
SHA512_SUFFIX:=$(CRYPTO_GENERIC)
endif
CRYPTO_MODULES = \
ALGAPI=crypto_algapi \
$(AEAD_CONF)=aead \
$(CRYPTO_MODULE_PCOMPRESS) \
$(BLKCIPHER_CONF)=$(BLKCIPHER_PREFIX)blkcipher \
$(HASH_CONF)=crypto_hash \
$(MANAGER_CONF)=cryptomgr \
AEAD2=aead \
PCOMP=pcompress \
BLKCIPHER2=crypto_blkcipher \
HASH2=crypto_hash \
MANAGER2=cryptomgr \
CBC=cbc \
ECB=ecb \
DEFLATE=deflate