crypto: powerpc/sha1-spe - 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-spe-glue.c b/arch/powerpc/crypto/sha1-spe-glue.c
index 9170892a8557836b0648a5387b929e68fc480234..04c88e173ce1592771fc8e21cacc987024401d88 100644 (file)
--- a/arch/powerpc/crypto/sha1-spe-glue.c
+++ b/arch/powerpc/crypto/sha1-spe-glue.c
@@ -7,16 +7,13 @@
  * Copyright (c) 2015 Markus Stockhausen <stockhausen@collogia.de>
  */
 
+#include <asm/switch_to.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/byteorder.h>
-#include <asm/switch_to.h>
-#include <linux/hardirq.h>
+#include <linux/kernel.h>
+#include <linux/preempt.h>
+#include <linux/module.h>
 
 /*
  * MAX_BYTES defines the number of bytes that are allowed to be processed
@@ -30,7 +27,7 @@
  */
 #define MAX_BYTES 2048
 
-extern void ppc_spe_sha1_transform(u32 *state, const u8 *src, u32 blocks);
+asmlinkage void ppc_spe_sha1_transform(u32 *state, const u8 *src, u32 blocks);
 
 static void spe_begin(void)
 {
@@ -46,126 +43,45 @@ static void spe_end(void)
        preempt_enable();
 }
 
-static inline void ppc_sha1_clear_context(struct sha1_state *sctx)
+static void ppc_spe_sha1_block(struct sha1_state *sctx, const u8 *src,
+                              int blocks)
 {
-       int count = sizeof(struct sha1_state) >> 2;
-       u32 *ptr = (u32 *)sctx;
-
-       /* make sure we can clear the fast way */
-       BUILD_BUG_ON(sizeof(struct sha1_state) % 4);
-       do { *ptr++ = 0; } while (--count);
-}
-
-static int ppc_spe_sha1_update(struct shash_desc *desc, const u8 *data,
-                       unsigned int len)
-{
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-       const unsigned int offset = sctx->count & 0x3f;
-       const unsigned int avail = 64 - offset;
-       unsigned int bytes;
-       const u8 *src = data;
-
-       if (avail > len) {
-               sctx->count += len;
-               memcpy((char *)sctx->buffer + offset, src, len);
-               return 0;
-       }
-
-       sctx->count += len;
-
-       if (offset) {
-               memcpy((char *)sctx->buffer + offset, src, avail);
+       do {
+               int unit = min(blocks, MAX_BYTES / SHA1_BLOCK_SIZE);
 
                spe_begin();
-               ppc_spe_sha1_transform(sctx->state, (const u8 *)sctx->buffer, 1);
+               ppc_spe_sha1_transform(sctx->state, src, unit);
                spe_end();
 
-               len -= avail;
-               src += avail;
-       }
-
-       while (len > 63) {
-               bytes = (len > MAX_BYTES) ? MAX_BYTES : len;
-               bytes = bytes & ~0x3f;
-
-               spe_begin();
-               ppc_spe_sha1_transform(sctx->state, src, bytes >> 6);
-               spe_end();
-
-               src += bytes;
-               len -= bytes;
-       }
-
-       memcpy((char *)sctx->buffer, src, len);
-       return 0;
-}
-
-static int ppc_spe_sha1_final(struct shash_desc *desc, u8 *out)
-{
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-       const unsigned int offset = sctx->count & 0x3f;
-       char *p = (char *)sctx->buffer + offset;
-       int padlen;
-       __be64 *pbits = (__be64 *)(((char *)&sctx->buffer) + 56);
-       __be32 *dst = (__be32 *)out;
-
-       padlen = 55 - offset;
-       *p++ = 0x80;
-
-       spe_begin();
-
-       if (padlen < 0) {
-               memset(p, 0x00, padlen + sizeof (u64));
-               ppc_spe_sha1_transform(sctx->state, sctx->buffer, 1);
-               p = (char *)sctx->buffer;
-               padlen = 56;
-       }
-
-       memset(p, 0, padlen);
-       *pbits = cpu_to_be64(sctx->count << 3);
-       ppc_spe_sha1_transform(sctx->state, sctx->buffer, 1);
-
-       spe_end();
-
-       dst[0] = cpu_to_be32(sctx->state[0]);
-       dst[1] = cpu_to_be32(sctx->state[1]);
-       dst[2] = cpu_to_be32(sctx->state[2]);
-       dst[3] = cpu_to_be32(sctx->state[3]);
-       dst[4] = cpu_to_be32(sctx->state[4]);
-
-       ppc_sha1_clear_context(sctx);
-       return 0;
+               src += unit * SHA1_BLOCK_SIZE;
+               blocks -= unit;
+       } while (blocks);
 }
 
-static int ppc_spe_sha1_export(struct shash_desc *desc, void *out)
+static int ppc_spe_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, ppc_spe_sha1_block);
 }
 
-static int ppc_spe_sha1_import(struct shash_desc *desc, const void *in)
+static int ppc_spe_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, ppc_spe_sha1_block);
+       return sha1_base_finish(desc, out);
 }
 
 static struct shash_alg alg = {
        .digestsize     =       SHA1_DIGEST_SIZE,
        .init           =       sha1_base_init,
        .update         =       ppc_spe_sha1_update,
-       .final          =       ppc_spe_sha1_final,
-       .export         =       ppc_spe_sha1_export,
-       .import         =       ppc_spe_sha1_import,
-       .descsize       =       sizeof(struct sha1_state),
-       .statesize      =       sizeof(struct sha1_state),
+       .finup          =       ppc_spe_sha1_finup,
+       .descsize       =       SHA1_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-ppc-spe",
                .cra_priority   =       300,
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }