[CRYPTO] sha512: Rename sha512 to sha512_generic

Rename sha512 to sha512_generic and add a MODULE_ALIAS for sha512
so all sha512 implementations can be loaded automatically.

Keep the broken tabs so git recognizes this as a rename.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Makefile b/crypto/Makefile
index 7cf36253a75ee3b898e61c24a7a9c524cb524495..cf702a270c59d27383ea389b80452ae0b559bc9a 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_CRYPTO_MD4) += md4.o
 obj-$(CONFIG_CRYPTO_MD5) += md5.o
 obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o
 obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o
-obj-$(CONFIG_CRYPTO_SHA512) += sha512.o
+obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o
 obj-$(CONFIG_CRYPTO_WP512) += wp512.o
 obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o
 obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o

diff --git a/crypto/sha512.c b/crypto/sha512_generic.c
similarity index 97%
rename from crypto/sha512.c
rename to crypto/sha512_generic.c
index c39c803ecc02dabc90bddecf52c837efdea6c902..82add4bf329a6ae0e0e5d378aed78983c1788209 100644 (file)
--- a/crypto/sha512.c
+++ b/crypto/sha512_generic.c
@@ -104,9 +104,9 @@ sha512_transform(u64 *state, u64 *W, const u8 *input)
         }
 
        /* load the state into our registers */
-       a=state[0];   b=state[1];   c=state[2];   d=state[3];  
-       e=state[4];   f=state[5];   g=state[6];   h=state[7];  
-  
+       a=state[0];   b=state[1];   c=state[2];   d=state[3];
+       e=state[4];   f=state[5];   g=state[6];   h=state[7];
+
        /* now iterate */
        for (i=0; i<80; i+=8) {
                t1 = h + e1(e) + Ch(e,f,g) + sha512_K[i  ] + W[i  ];
@@ -126,9 +126,9 @@ sha512_transform(u64 *state, u64 *W, const u8 *input)
                t1 = a + e1(f) + Ch(f,g,h) + sha512_K[i+7] + W[i+7];
                t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
        }
-  
-       state[0] += a; state[1] += b; state[2] += c; state[3] += d;  
-       state[4] += e; state[5] += f; state[6] += g; state[7] += h;  
+
+       state[0] += a; state[1] += b; state[2] += c; state[3] += d;
+       state[4] += e; state[5] += f; state[6] += g; state[7] += h;
 
        /* erase our data */
        a = b = c = d = e = f = g = h = t1 = t2 = 0;
@@ -173,7 +173,7 @@ sha512_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)
 
        /* Compute number of bytes mod 128 */
        index = (unsigned int)((sctx->count[0] >> 3) & 0x7F);
-       
+
        /* Update number of bits */
        if ((sctx->count[0] += (len << 3)) < (len << 3)) {
                if ((sctx->count[1] += 1) < 1)
@@ -181,9 +181,9 @@ sha512_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)
                                sctx->count[3]++;
                sctx->count[1] += (len >> 29);
        }
-       
+
         part_len = 128 - index;
-       
+
        /* Transform as many times as possible. */
        if (len >= part_len) {
                memcpy(&sctx->buf[index], data, part_len);
@@ -278,8 +278,6 @@ static struct crypto_alg sha384 = {
         }
 };
 
-MODULE_ALIAS("sha384");
-
 static int __init init(void)
 {
         int ret = 0;
@@ -303,3 +301,6 @@ module_exit(fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA-512 and SHA-384 Secure Hash Algorithms");
+
+MODULE_ALIAS("sha384");
+MODULE_ALIAS("sha512");