diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-01-06 18:50:38 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-01-06 18:50:38 +0000 |
| commit | 6769fc65bb34f42ecb1259b53a26d23da92741cb (patch) | |
| tree | 331be7409f530771db8d5baa51045fb237f0cc96 | |
| parent | 04ba8ab358b5c7a3e91a326821f1ac89161fb9d4 (diff) | |
| download | upstream-6769fc65bb34f42ecb1259b53a26d23da92741cb.tar.gz upstream-6769fc65bb34f42ecb1259b53a26d23da92741cb.tar.bz2 upstream-6769fc65bb34f42ecb1259b53a26d23da92741cb.zip | |
kernel: cleanup crypto stuff and fix module names on 2.4
SVN-Revision: 19058
| -rw-r--r-- | package/kernel/modules/crypto.mk | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 0394881152..1d0985b029 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -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 |