Re: [PATCH] [crypto] load the SHA1[1|256] module by an alias

[Jan Glauber <jan.glauber@de.ibm.com>]

Hi Sebastian,

what about SHA-512? Should that not also be renamed to sha512_generic.c ?

--Jan

On Thu, 2007-10-04 at 09:37 +0200, Sebastian Siewior wrote:
> 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: Sebastian Siewior <sebastian@breakpoint.cc>
> ---
>  arch/s390/crypto/sha1_s390.c          |    2 +-
>  arch/s390/crypto/sha256_s390.c        |    2 +-
>  crypto/Makefile                       |    4 ++--
>  crypto/{sha1.c => sha1_generic.c}     |    2 +-
>  crypto/{sha256.c => sha256_generic.c} |    2 +-
>  drivers/crypto/padlock-sha.c          |    4 ++--
>  6 files changed, 8 insertions(+), 8 deletions(-)
>  rename crypto/{sha1.c => sha1_generic.c} (99%)
>  rename crypto/{sha256.c => sha256_generic.c} (99%)
> 
> diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
> index af4460e..8ebd3cd 100644
> --- a/arch/s390/crypto/sha1_s390.c
> +++ b/arch/s390/crypto/sha1_s390.c
> @@ -12,7 +12,7 @@
>   *   Author(s): Thomas Spatzier
>   *		Jan Glauber (jan.glauber@de.ibm.com)
>   *
> - * Derived from "crypto/sha1.c"
> + * Derived from "crypto/sha1_generic.c"
>   *   Copyright (c) Alan Smithee.
>   *   Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
>   *   Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
> diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
> index 2ced333..c728bd0 100644
> --- a/arch/s390/crypto/sha256_s390.c
> +++ b/arch/s390/crypto/sha256_s390.c
> @@ -7,7 +7,7 @@
>   *   Copyright IBM Corp. 2005,2007
>   *   Author(s): Jan Glauber (jang@de.ibm.com)
>   *
> - * Derived from "crypto/sha256.c"
> + * Derived from "crypto/sha256_generic.c"
>   * and "arch/s390/crypto/sha1_s390.c"
>   *
>   * This program is free software; you can redistribute it and/or modify it
> diff --git a/crypto/Makefile b/crypto/Makefile
> index b6ef5e4..43c2a0d 100644
> --- a/crypto/Makefile
> +++ b/crypto/Makefile
> @@ -21,8 +21,8 @@ obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o
>  obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
>  obj-$(CONFIG_CRYPTO_MD4) += md4.o
>  obj-$(CONFIG_CRYPTO_MD5) += md5.o
> -obj-$(CONFIG_CRYPTO_SHA1) += sha1.o
> -obj-$(CONFIG_CRYPTO_SHA256) += sha256.o
> +obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o
> +obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o
>  obj-$(CONFIG_CRYPTO_SHA512) += sha512.o
>  obj-$(CONFIG_CRYPTO_WP512) += wp512.o
>  obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o
> diff --git a/crypto/sha1.c b/crypto/sha1_generic.c
> similarity index 99%
> rename from crypto/sha1.c
> rename to crypto/sha1_generic.c
> index 1bba551..70364dd 100644
> --- a/crypto/sha1.c
> +++ b/crypto/sha1_generic.c
> @@ -139,4 +139,4 @@ module_exit(fini);
>  MODULE_LICENSE("GPL");
>  MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
>  
> -MODULE_ALIAS("sha1-generic");
> +MODULE_ALIAS("sha1");
> diff --git a/crypto/sha256.c b/crypto/sha256_generic.c
> similarity index 99%
> rename from crypto/sha256.c
> rename to crypto/sha256_generic.c
> index 716195b..74bf2f9 100644
> --- a/crypto/sha256.c
> +++ b/crypto/sha256_generic.c
> @@ -339,4 +339,4 @@ module_exit(fini);
>  MODULE_LICENSE("GPL");
>  MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm");
>  
> -MODULE_ALIAS("sha256-generic");
> +MODULE_ALIAS("sha256");
> diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
> index a781fd2..b8ee645 100644
> --- a/drivers/crypto/padlock-sha.c
> +++ b/drivers/crypto/padlock-sha.c
> @@ -314,5 +314,5 @@ MODULE_DESCRIPTION("VIA PadLock SHA1/SHA256 algorithms support.");
>  MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Michal Ludvig");
>  
> -MODULE_ALIAS("sha1-padlock");
> -MODULE_ALIAS("sha256-padlock");
> +MODULE_ALIAS("sha1");
> +MODULE_ALIAS("sha256");
-- 
++49 7031 161911

IBM Deutschland Entwicklung GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Herbert
Kircher, Sitz der Gesellschaft: Böblingen, Registergericht Amtsgericht
Stuttgart, HRB 243294