crypto: powerpc/sha1 - Use API partial block handling

Use the Crypto API partial block handling.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/powerpc/crypto/sha1.c b/arch/powerpc/crypto/sha1.c
index f283bbd3f12105ff52efccbd2a13b41d471c5c63..4593946aa9b3324bd84c85acf50e898756f3d5f8 100644 (file)
--- a/arch/powerpc/crypto/sha1.c
+++ b/arch/powerpc/crypto/sha1.c
@@ -13,107 +13,46 @@
  * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
  */
 #include <crypto/internal/hash.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/types.h>
 #include <crypto/sha1.h>
 #include <crypto/sha1_base.h>
-#include <asm/byteorder.h>
-
-void powerpc_sha_transform(u32 *state, const u8 *src);
-
-static int powerpc_sha1_update(struct shash_desc *desc, const u8 *data,
-                              unsigned int len)
-{
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-       unsigned int partial, done;
-       const u8 *src;
-
-       partial = sctx->count & 0x3f;
-       sctx->count += len;
-       done = 0;
-       src = data;
-
-       if ((partial + len) > 63) {
-
-               if (partial) {
-                       done = -partial;
-                       memcpy(sctx->buffer + partial, data, done + 64);
-                       src = sctx->buffer;
-               }
-
-               do {
-                       powerpc_sha_transform(sctx->state, src);
-                       done += 64;
-                       src = data + done;
-               } while (done + 63 < len);
-
-               partial = 0;
-       }
-       memcpy(sctx->buffer + partial, src, len - done);
-
-       return 0;
-}
+#include <linux/kernel.h>
+#include <linux/module.h>
 
+asmlinkage void powerpc_sha_transform(u32 *state, const u8 *src);
 
-/* Add padding and return the message digest. */
-static int powerpc_sha1_final(struct shash_desc *desc, u8 *out)
+static void powerpc_sha_block(struct sha1_state *sctx, const u8 *data,
+                             int blocks)
 {
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-       __be32 *dst = (__be32 *)out;
-       u32 i, index, padlen;
-       __be64 bits;
-       static const u8 padding[64] = { 0x80, };
-
-       bits = cpu_to_be64(sctx->count << 3);
-
-       /* Pad out to 56 mod 64 */
-       index = sctx->count & 0x3f;
-       padlen = (index < 56) ? (56 - index) : ((64+56) - index);
-       powerpc_sha1_update(desc, padding, padlen);
-
-       /* Append length */
-       powerpc_sha1_update(desc, (const u8 *)&bits, sizeof(bits));
-
-       /* Store state in digest */
-       for (i = 0; i < 5; i++)
-               dst[i] = cpu_to_be32(sctx->state[i]);
-
-       /* Wipe context */
-       memset(sctx, 0, sizeof *sctx);
-
-       return 0;
+       do {
+               powerpc_sha_transform(sctx->state, data);
+               data += 64;
+       } while (--blocks);
 }
 
-static int powerpc_sha1_export(struct shash_desc *desc, void *out)
+static int powerpc_sha1_update(struct shash_desc *desc, const u8 *data,
+                              unsigned int len)
 {
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-
-       memcpy(out, sctx, sizeof(*sctx));
-       return 0;
+       return sha1_base_do_update_blocks(desc, data, len, powerpc_sha_block);
 }
 
-static int powerpc_sha1_import(struct shash_desc *desc, const void *in)
+/* Add padding and return the message digest. */
+static int powerpc_sha1_finup(struct shash_desc *desc, const u8 *src,
+                             unsigned int len, u8 *out)
 {
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-
-       memcpy(sctx, in, sizeof(*sctx));
-       return 0;
+       sha1_base_do_finup(desc, src, len, powerpc_sha_block);
+       return sha1_base_finish(desc, out);
 }
 
 static struct shash_alg alg = {
        .digestsize     =       SHA1_DIGEST_SIZE,
        .init           =       sha1_base_init,
        .update         =       powerpc_sha1_update,
-       .final          =       powerpc_sha1_final,
-       .export         =       powerpc_sha1_export,
-       .import         =       powerpc_sha1_import,
-       .descsize       =       sizeof(struct sha1_state),
-       .statesize      =       sizeof(struct sha1_state),
+       .finup          =       powerpc_sha1_finup,
+       .descsize       =       SHA1_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-powerpc",
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }