Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8246af0 authored by Sebastian Siewior's avatar Sebastian Siewior Committed by David S. Miller
Browse files

[CRYPTO] aes: Rename aes to aes-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.

Additionally it ensures that the generic implementation as well as the
HW driver (if available) is loaded in case the HW driver needs the
generic version as fallback in corner cases.

Signed-off-by: default avatarSebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c5a511f1

arch/s390/crypto/aes_s390.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *   Copyright IBM Corp. 2005,2007

 *   Author(s): Jan Glauber (jang@de.ibm.com)

 *

 * Derived from "crypto/aes.c"

 * Derived from "crypto/aes_generic.c"

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the Free

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o 
obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o

obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o

obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o

obj-$(CONFIG_CRYPTO_AES) += aes.o

obj-$(CONFIG_CRYPTO_AES) += aes_generic.o

obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o

obj-$(CONFIG_CRYPTO_CAST5) += cast5.o

obj-$(CONFIG_CRYPTO_CAST6) += cast6.o

crypto/aes.c→crypto/aes_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -453,4 +453,4 @@ module_exit(aes_fini); 


MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_ALIAS("aes");

drivers/crypto/geode-aes.c

+1 −0
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ geode_aes_exit(void) 
MODULE_AUTHOR("Advanced Micro Devices, Inc.");

MODULE_DESCRIPTION("Geode LX Hardware AES driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("aes");



module_init(geode_aes_init);

module_exit(geode_aes_exit);

drivers/crypto/padlock-aes.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * Copyright (c) 2004  Michal Ludvig <michal@logix.cz>

 *

 * Key expansion routine taken from crypto/aes.c

 * Key expansion routine taken from crypto/aes_generic.c

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -660,4 +660,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algorithm support"); 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("Michal Ludvig");



MODULE_ALIAS("aes-padlock");
 
MODULE_ALIAS("aes");