summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorSebastian Siewior <sebastian@breakpoint.cc>2007-10-05 12:42:03 +0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-11 03:55:49 +0400
commitc5a511f1cd6f90a98ad11dd97e2313c7c787deb2 (patch)
tree209dc01d7dc32ae00563ee81ee4df98118f95f1c /crypto
parent7607bd8ff03b8af5af887931318cb2bb20361856 (diff)
downloadlinux-c5a511f1cd6f90a98ad11dd97e2313c7c787deb2.tar.xz
[CRYPTO] des: Rename des to des-generic
Loading the crypto algorithm by the alias instead of by module directly has the advantage that all possible implementations of this algorithm are loaded automatically and the crypto API can choose the best one depending on its priority. Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Makefile2
-rw-r--r--crypto/des_generic.c (renamed from crypto/des.c)1
2 files changed, 2 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index e96a07e16bf2..a624cbc188fc 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o
obj-$(CONFIG_CRYPTO_LRW) += lrw.o
obj-$(CONFIG_CRYPTO_XTS) += xts.o
obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
-obj-$(CONFIG_CRYPTO_DES) += des.o
+obj-$(CONFIG_CRYPTO_DES) += des_generic.o
obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o
obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
diff --git a/crypto/des.c b/crypto/des_generic.c
index 1df3a714fa47..59966d14b8e0 100644
--- a/crypto/des.c
+++ b/crypto/des_generic.c
@@ -1009,3 +1009,4 @@ module_exit(fini);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
MODULE_AUTHOR("Dag Arne Osvik <da@osvik.no>");
+MODULE_ALIAS("des");