crypto: mips/octeon-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/mips/cavium-octeon/crypto/octeon-sha1.c b/arch/mips/cavium-octeon/crypto/octeon-sha1.c
index 37a07b3c45685d7dbecd00df96c59c7b6f6f01b5..e70f21a473daffb0299f96e39699e1e6951ed901 100644 (file)
--- a/arch/mips/cavium-octeon/crypto/octeon-sha1.c
+++ b/arch/mips/cavium-octeon/crypto/octeon-sha1.c
@@ -13,15 +13,13 @@
  * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
  */
 
-#include <linux/mm.h>
+#include <asm/octeon/octeon.h>
+#include <crypto/internal/hash.h>
 #include <crypto/sha1.h>
 #include <crypto/sha1_base.h>
-#include <linux/init.h>
-#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/byteorder.h>
-#include <asm/octeon/octeon.h>
-#include <crypto/internal/hash.h>
 
 #include "octeon-crypto.h"
 
@@ -58,49 +56,23 @@ static void octeon_sha1_read_hash(struct sha1_state *sctx)
        memzero_explicit(&hash_tail.dword, sizeof(hash_tail.dword));
 }
 
-static void octeon_sha1_transform(const void *_block)
+static void octeon_sha1_transform(struct sha1_state *sctx, const u8 *src,
+                                 int blocks)
 {
-       const u64 *block = _block;
-
-       write_octeon_64bit_block_dword(block[0], 0);
-       write_octeon_64bit_block_dword(block[1], 1);
-       write_octeon_64bit_block_dword(block[2], 2);
-       write_octeon_64bit_block_dword(block[3], 3);
-       write_octeon_64bit_block_dword(block[4], 4);
-       write_octeon_64bit_block_dword(block[5], 5);
-       write_octeon_64bit_block_dword(block[6], 6);
-       octeon_sha1_start(block[7]);
-}
-
-static void __octeon_sha1_update(struct sha1_state *sctx, const u8 *data,
-                                unsigned int len)
-{
-       unsigned int partial;
-       unsigned int done;
-       const u8 *src;
-
-       partial = sctx->count % SHA1_BLOCK_SIZE;
-       sctx->count += len;
-       done = 0;
-       src = data;
-
-       if ((partial + len) >= SHA1_BLOCK_SIZE) {
-               if (partial) {
-                       done = -partial;
-                       memcpy(sctx->buffer + partial, data,
-                              done + SHA1_BLOCK_SIZE);
-                       src = sctx->buffer;
-               }
-
-               do {
-                       octeon_sha1_transform(src);
-                       done += SHA1_BLOCK_SIZE;
-                       src = data + done;
-               } while (done + SHA1_BLOCK_SIZE <= len);
-
-               partial = 0;
-       }
-       memcpy(sctx->buffer + partial, src, len - done);
+       do {
+               const u64 *block = (const u64 *)src;
+
+               write_octeon_64bit_block_dword(block[0], 0);
+               write_octeon_64bit_block_dword(block[1], 1);
+               write_octeon_64bit_block_dword(block[2], 2);
+               write_octeon_64bit_block_dword(block[3], 3);
+               write_octeon_64bit_block_dword(block[4], 4);
+               write_octeon_64bit_block_dword(block[5], 5);
+               write_octeon_64bit_block_dword(block[6], 6);
+               octeon_sha1_start(block[7]);
+
+               src += SHA1_BLOCK_SIZE;
+       } while (--blocks);
 }
 
 static int octeon_sha1_update(struct shash_desc *desc, const u8 *data,
@@ -109,95 +81,47 @@ static int octeon_sha1_update(struct shash_desc *desc, const u8 *data,
        struct sha1_state *sctx = shash_desc_ctx(desc);
        struct octeon_cop2_state state;
        unsigned long flags;
-
-       /*
-        * Small updates never reach the crypto engine, so the generic sha1 is
-        * faster because of the heavyweight octeon_crypto_enable() /
-        * octeon_crypto_disable().
-        */
-       if ((sctx->count % SHA1_BLOCK_SIZE) + len < SHA1_BLOCK_SIZE)
-               return crypto_sha1_update(desc, data, len);
+       int remain;
 
        flags = octeon_crypto_enable(&state);
        octeon_sha1_store_hash(sctx);
 
-       __octeon_sha1_update(sctx, data, len);
+       remain = sha1_base_do_update_blocks(desc, data, len,
+                                           octeon_sha1_transform);
 
        octeon_sha1_read_hash(sctx);
        octeon_crypto_disable(&state, flags);
-
-       return 0;
+       return remain;
 }
 
-static int octeon_sha1_final(struct shash_desc *desc, u8 *out)
+static int octeon_sha1_finup(struct shash_desc *desc, const u8 *src,
+                            unsigned int len, u8 *out)
 {
        struct sha1_state *sctx = shash_desc_ctx(desc);
-       static const u8 padding[64] = { 0x80, };
        struct octeon_cop2_state state;
-       __be32 *dst = (__be32 *)out;
-       unsigned int pad_len;
        unsigned long flags;
-       unsigned int index;
-       __be64 bits;
-       int i;
-
-       /* Save number of bits. */
-       bits = cpu_to_be64(sctx->count << 3);
-
-       /* Pad out to 56 mod 64. */
-       index = sctx->count & 0x3f;
-       pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
 
        flags = octeon_crypto_enable(&state);
        octeon_sha1_store_hash(sctx);
 
-       __octeon_sha1_update(sctx, padding, pad_len);
-
-       /* Append length (before padding). */
-       __octeon_sha1_update(sctx, (const u8 *)&bits, sizeof(bits));
+       sha1_base_do_finup(desc, src, len, octeon_sha1_transform);
 
        octeon_sha1_read_hash(sctx);
        octeon_crypto_disable(&state, flags);
-
-       /* Store state in digest */
-       for (i = 0; i < 5; i++)
-               dst[i] = cpu_to_be32(sctx->state[i]);
-
-       /* Zeroize sensitive information. */
-       memset(sctx, 0, sizeof(*sctx));
-
-       return 0;
-}
-
-static int octeon_sha1_export(struct shash_desc *desc, void *out)
-{
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-
-       memcpy(out, sctx, sizeof(*sctx));
-       return 0;
-}
-
-static int octeon_sha1_import(struct shash_desc *desc, const void *in)
-{
-       struct sha1_state *sctx = shash_desc_ctx(desc);
-
-       memcpy(sctx, in, sizeof(*sctx));
-       return 0;
+       return sha1_base_finish(desc, out);
 }
 
 static struct shash_alg octeon_sha1_alg = {
        .digestsize     =       SHA1_DIGEST_SIZE,
        .init           =       sha1_base_init,
        .update         =       octeon_sha1_update,
-       .final          =       octeon_sha1_final,
-       .export         =       octeon_sha1_export,
-       .import         =       octeon_sha1_import,
-       .descsize       =       sizeof(struct sha1_state),
-       .statesize      =       sizeof(struct sha1_state),
+       .finup          =       octeon_sha1_finup,
+       .descsize       =       SHA1_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha1",
                .cra_driver_name=       "octeon-sha1",
                .cra_priority   =       OCTEON_CR_OPCODE_PRIORITY,
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }