crypto: sparc/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/sparc/crypto/sha1_glue.c b/arch/sparc/crypto/sha1_glue.c
index 06b7becfcb211ecba65689349456f359c5022490..ec5a06948e0d44f12414be7be18ea5e1948dc2cd 100644 (file)
--- a/arch/sparc/crypto/sha1_glue.c
+++ b/arch/sparc/crypto/sha1_glue.c
@@ -11,124 +11,45 @@
 
 #define pr_fmt(fmt)    KBUILD_MODNAME ": " fmt
 
+#include <asm/elf.h>
+#include <asm/pstate.h>
 #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/pstate.h>
-#include <asm/elf.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 #include "opcodes.h"
 
-asmlinkage void sha1_sparc64_transform(u32 *digest, const char *data,
-                                      unsigned int rounds);
-
-static void __sha1_sparc64_update(struct sha1_state *sctx, const u8 *data,
-                                 unsigned int len, unsigned int partial)
-{
-       unsigned int done = 0;
-
-       sctx->count += len;
-       if (partial) {
-               done = SHA1_BLOCK_SIZE - partial;
-               memcpy(sctx->buffer + partial, data, done);
-               sha1_sparc64_transform(sctx->state, sctx->buffer, 1);
-       }
-       if (len - done >= SHA1_BLOCK_SIZE) {
-               const unsigned int rounds = (len - done) / SHA1_BLOCK_SIZE;
-
-               sha1_sparc64_transform(sctx->state, data + done, rounds);
-               done += rounds * SHA1_BLOCK_SIZE;
-       }
-
-       memcpy(sctx->buffer, data + done, len - done);
-}
+asmlinkage void sha1_sparc64_transform(struct sha1_state *digest,
+                                      const u8 *data, int rounds);
 
 static int sha1_sparc64_update(struct shash_desc *desc, const u8 *data,
                               unsigned int len)
 {
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-       unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;
-
-       /* Handle the fast case right here */
-       if (partial + len < SHA1_BLOCK_SIZE) {
-               sctx->count += len;
-               memcpy(sctx->buffer + partial, data, len);
-       } else
-               __sha1_sparc64_update(sctx, data, len, partial);
-
-       return 0;
+       return sha1_base_do_update_blocks(desc, data, len,
+                                         sha1_sparc64_transform);
 }
 
 /* Add padding and return the message digest. */
-static int sha1_sparc64_final(struct shash_desc *desc, u8 *out)
-{
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-       unsigned int i, index, padlen;
-       __be32 *dst = (__be32 *)out;
-       __be64 bits;
-       static const u8 padding[SHA1_BLOCK_SIZE] = { 0x80, };
-
-       bits = cpu_to_be64(sctx->count << 3);
-
-       /* Pad out to 56 mod 64 and append length */
-       index = sctx->count % SHA1_BLOCK_SIZE;
-       padlen = (index < 56) ? (56 - index) : ((SHA1_BLOCK_SIZE+56) - index);
-
-       /* We need to fill a whole block for __sha1_sparc64_update() */
-       if (padlen <= 56) {
-               sctx->count += padlen;
-               memcpy(sctx->buffer + index, padding, padlen);
-       } else {
-               __sha1_sparc64_update(sctx, padding, padlen, index);
-       }
-       __sha1_sparc64_update(sctx, (const u8 *)&bits, sizeof(bits), 56);
-
-       /* 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;
-}
-
-static int sha1_sparc64_export(struct shash_desc *desc, void *out)
+static int sha1_sparc64_finup(struct shash_desc *desc, const u8 *src,
+                             unsigned int len, u8 *out)
 {
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-
-       memcpy(out, sctx, sizeof(*sctx));
-
-       return 0;
-}
-
-static int sha1_sparc64_import(struct shash_desc *desc, const void *in)
-{
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-
-       memcpy(sctx, in, sizeof(*sctx));
-
-       return 0;
+       sha1_base_do_finup(desc, src, len, sha1_sparc64_transform);
+       return sha1_base_finish(desc, out);
 }
 
 static struct shash_alg alg = {
        .digestsize     =       SHA1_DIGEST_SIZE,
        .init           =       sha1_base_init,
        .update         =       sha1_sparc64_update,
-       .final          =       sha1_sparc64_final,
-       .export         =       sha1_sparc64_export,
-       .import         =       sha1_sparc64_import,
-       .descsize       =       sizeof(struct sha1_state),
-       .statesize      =       sizeof(struct sha1_state),
+       .finup          =       sha1_sparc64_finup,
+       .descsize       =       SHA1_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-sparc64",
                .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }