crypto: sha1-generic - 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/crypto/sha1_generic.c b/crypto/sha1_generic.c
index 325b57fe28dc1351126f4e9527aaff7b25a2b70b..7a3c837923b5acab5e250625acdea34f600f9da0 100644 (file)
--- a/crypto/sha1_generic.c
+++ b/crypto/sha1_generic.c
@@ -12,13 +12,11 @@
  * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
  */
 #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 <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
 
 const u8 sha1_zero_message_hash[SHA1_DIGEST_SIZE] = {
        0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d,
@@ -39,38 +37,31 @@ static void sha1_generic_block_fn(struct sha1_state *sst, u8 const *src,
        memzero_explicit(temp, sizeof(temp));
 }
 
-int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
-                      unsigned int len)
+static int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
+                             unsigned int len)
 {
-       return sha1_base_do_update(desc, data, len, sha1_generic_block_fn);
+       return sha1_base_do_update_blocks(desc, data, len,
+                                         sha1_generic_block_fn);
 }
-EXPORT_SYMBOL(crypto_sha1_update);
 
-static int sha1_final(struct shash_desc *desc, u8 *out)
+static int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,
+                            unsigned int len, u8 *out)
 {
-       sha1_base_do_finalize(desc, sha1_generic_block_fn);
+       sha1_base_do_finup(desc, data, len, sha1_generic_block_fn);
        return sha1_base_finish(desc, out);
 }
 
-int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,
-                     unsigned int len, u8 *out)
-{
-       sha1_base_do_update(desc, data, len, sha1_generic_block_fn);
-       return sha1_final(desc, out);
-}
-EXPORT_SYMBOL(crypto_sha1_finup);
-
 static struct shash_alg alg = {
        .digestsize     =       SHA1_DIGEST_SIZE,
        .init           =       sha1_base_init,
        .update         =       crypto_sha1_update,
-       .final          =       sha1_final,
        .finup          =       crypto_sha1_finup,
-       .descsize       =       sizeof(struct sha1_state),
+       .descsize       =       SHA1_STATE_SIZE,
        .base           =       {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-generic",
                .cra_priority   =       100,
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/include/crypto/sha1.h b/include/crypto/sha1.h
index dd6de4a4d6e699b5f85501fa2da4fd09a4521e0f..f48230b1413c3ddfcf98db7c27ef9c6c094bff46 100644 (file)
--- a/include/crypto/sha1.h
+++ b/include/crypto/sha1.h
@@ -26,14 +26,6 @@ struct sha1_state {
        u8 buffer[SHA1_BLOCK_SIZE];
 };
 
-struct shash_desc;
-
-extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
-                             unsigned int len);
-
-extern int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,
-                            unsigned int len, u8 *hash);
-
 /*
  * An implementation of SHA-1's compression function.  Don't use in new code!
  * You shouldn't be using SHA-1, and even if you *have* to use SHA-1, this isn't