crypto: arm/sha1-asm - 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/arm/crypto/sha1.h b/arch/arm/crypto/sha1.h
deleted file mode 100644 (file)
index b1b7e21..0000000
--- a/arch/arm/crypto/sha1.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef ASM_ARM_CRYPTO_SHA1_H
-#define ASM_ARM_CRYPTO_SHA1_H
-
-#include <linux/crypto.h>
-#include <crypto/sha1.h>
-
-extern int sha1_update_arm(struct shash_desc *desc, const u8 *data,
-                          unsigned int len);
-
-extern int sha1_finup_arm(struct shash_desc *desc, const u8 *data,
-                          unsigned int len, u8 *out);
-
-#endif

diff --git a/arch/arm/crypto/sha1_glue.c b/arch/arm/crypto/sha1_glue.c
index 95a727bcd664f74d1cbefccd21eb0f121a3de7d7..255da00c7d98affc63a001383671a0d388caba58 100644 (file)
--- a/arch/arm/crypto/sha1_glue.c
+++ b/arch/arm/crypto/sha1_glue.c
@@ -12,53 +12,42 @@
  */
 
 #include <crypto/internal/hash.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
 #include <crypto/sha1.h>
 #include <crypto/sha1_base.h>
-#include <asm/byteorder.h>
-
-#include "sha1.h"
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 asmlinkage void sha1_block_data_order(struct sha1_state *digest,
                const u8 *data, int rounds);
 
-int sha1_update_arm(struct shash_desc *desc, const u8 *data,
-                   unsigned int len)
+static int sha1_update_arm(struct shash_desc *desc, const u8 *data,
+                          unsigned int len)
 {
        /* make sure signature matches sha1_block_fn() */
        BUILD_BUG_ON(offsetof(struct sha1_state, state) != 0);
 
-       return sha1_base_do_update(desc, data, len, sha1_block_data_order);
+       return sha1_base_do_update_blocks(desc, data, len,
+                                         sha1_block_data_order);
 }
-EXPORT_SYMBOL_GPL(sha1_update_arm);
 
-static int sha1_final(struct shash_desc *desc, u8 *out)
+static int sha1_finup_arm(struct shash_desc *desc, const u8 *data,
+                         unsigned int len, u8 *out)
 {
-       sha1_base_do_finalize(desc, sha1_block_data_order);
+       sha1_base_do_finup(desc, data, len, sha1_block_data_order);
        return sha1_base_finish(desc, out);
 }
 
-int sha1_finup_arm(struct shash_desc *desc, const u8 *data,
-                  unsigned int len, u8 *out)
-{
-       sha1_base_do_update(desc, data, len, sha1_block_data_order);
-       return sha1_final(desc, out);
-}
-EXPORT_SYMBOL_GPL(sha1_finup_arm);
-
 static struct shash_alg alg = {
        .digestsize     =       SHA1_DIGEST_SIZE,
        .init           =       sha1_base_init,
        .update         =       sha1_update_arm,
-       .final          =       sha1_final,
        .finup          =       sha1_finup_arm,
-       .descsize       =       sizeof(struct sha1_state),
+       .descsize       =       SHA1_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-asm",
                .cra_priority   =       150,
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }