crypto: sparc/sha512 - 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/sha512_glue.c b/arch/sparc/crypto/sha512_glue.c
index d66efa4ec59af3220e15fa1a90fb101586a077d4..1d0e1f98ca461655731186c3ef6e3393c196b1e9 100644 (file)
--- a/arch/sparc/crypto/sha512_glue.c
+++ b/arch/sparc/crypto/sha512_glue.c
@@ -10,115 +10,43 @@
 
 #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/sha2.h>
 #include <crypto/sha512_base.h>
-
-#include <asm/pstate.h>
-#include <asm/elf.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 #include "opcodes.h"
 
 asmlinkage void sha512_sparc64_transform(u64 *digest, const char *data,
                                         unsigned int rounds);
 
-static void __sha512_sparc64_update(struct sha512_state *sctx, const u8 *data,
-                                   unsigned int len, unsigned int partial)
+static void sha512_block(struct sha512_state *sctx, const u8 *src, int blocks)
 {
-       unsigned int done = 0;
-
-       if ((sctx->count[0] += len) < len)
-               sctx->count[1]++;
-       if (partial) {
-               done = SHA512_BLOCK_SIZE - partial;
-               memcpy(sctx->buf + partial, data, done);
-               sha512_sparc64_transform(sctx->state, sctx->buf, 1);
-       }
-       if (len - done >= SHA512_BLOCK_SIZE) {
-               const unsigned int rounds = (len - done) / SHA512_BLOCK_SIZE;
-
-               sha512_sparc64_transform(sctx->state, data + done, rounds);
-               done += rounds * SHA512_BLOCK_SIZE;
-       }
-
-       memcpy(sctx->buf, data + done, len - done);
+       sha512_sparc64_transform(sctx->state, src, blocks);
 }
 
 static int sha512_sparc64_update(struct shash_desc *desc, const u8 *data,
                                 unsigned int len)
 {
-       struct sha512_state *sctx = shash_desc_ctx(desc);
-       unsigned int partial = sctx->count[0] % SHA512_BLOCK_SIZE;
-
-       /* Handle the fast case right here */
-       if (partial + len < SHA512_BLOCK_SIZE) {
-               if ((sctx->count[0] += len) < len)
-                       sctx->count[1]++;
-               memcpy(sctx->buf + partial, data, len);
-       } else
-               __sha512_sparc64_update(sctx, data, len, partial);
-
-       return 0;
+       return sha512_base_do_update_blocks(desc, data, len, sha512_block);
 }
 
-static int sha512_sparc64_final(struct shash_desc *desc, u8 *out)
+static int sha512_sparc64_finup(struct shash_desc *desc, const u8 *src,
+                               unsigned int len, u8 *out)
 {
-       struct sha512_state *sctx = shash_desc_ctx(desc);
-       unsigned int i, index, padlen;
-       __be64 *dst = (__be64 *)out;
-       __be64 bits[2];
-       static const u8 padding[SHA512_BLOCK_SIZE] = { 0x80, };
-
-       /* Save number of bits */
-       bits[1] = cpu_to_be64(sctx->count[0] << 3);
-       bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61);
-
-       /* Pad out to 112 mod 128 and append length */
-       index = sctx->count[0] % SHA512_BLOCK_SIZE;
-       padlen = (index < 112) ? (112 - index) : ((SHA512_BLOCK_SIZE+112) - index);
-
-       /* We need to fill a whole block for __sha512_sparc64_update() */
-       if (padlen <= 112) {
-               if ((sctx->count[0] += padlen) < padlen)
-                       sctx->count[1]++;
-               memcpy(sctx->buf + index, padding, padlen);
-       } else {
-               __sha512_sparc64_update(sctx, padding, padlen, index);
-       }
-       __sha512_sparc64_update(sctx, (const u8 *)&bits, sizeof(bits), 112);
-
-       /* Store state in digest */
-       for (i = 0; i < 8; i++)
-               dst[i] = cpu_to_be64(sctx->state[i]);
-
-       /* Wipe context */
-       memset(sctx, 0, sizeof(*sctx));
-
-       return 0;
-}
-
-static int sha384_sparc64_final(struct shash_desc *desc, u8 *hash)
-{
-       u8 D[64];
-
-       sha512_sparc64_final(desc, D);
-
-       memcpy(hash, D, 48);
-       memzero_explicit(D, 64);
-
-       return 0;
+       sha512_base_do_finup(desc, src, len, sha512_block);
+       return sha512_base_finish(desc, out);
 }
 
 static struct shash_alg sha512 = {
        .digestsize     =       SHA512_DIGEST_SIZE,
        .init           =       sha512_base_init,
        .update         =       sha512_sparc64_update,
-       .final          =       sha512_sparc64_final,
-       .descsize       =       sizeof(struct sha512_state),
+       .finup          =       sha512_sparc64_finup,
+       .descsize       =       SHA512_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha512",
                .cra_driver_name=       "sha512-sparc64",
@@ -132,8 +60,8 @@ static struct shash_alg sha384 = {
        .digestsize     =       SHA384_DIGEST_SIZE,
        .init           =       sha384_base_init,
        .update         =       sha512_sparc64_update,
-       .final          =       sha384_sparc64_final,
-       .descsize       =       sizeof(struct sha512_state),
+       .finup          =       sha512_sparc64_finup,
+       .descsize       =       SHA512_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha384",
                .cra_driver_name=       "sha384-sparc64",