crypto: arm/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/arm64/crypto/sha512-glue.c b/arch/arm64/crypto/sha512-glue.c
index f789deabefc0a88fa9c0245039d146c4a1fdc675..ab2e1c13dfadc413f0663e1fc19da688a084a099 100644 (file)
--- a/arch/arm64/crypto/sha512-glue.c
+++ b/arch/arm64/crypto/sha512-glue.c
@@ -6,10 +6,10 @@
  */
 
 #include <crypto/internal/hash.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <crypto/sha2.h>
 #include <crypto/sha512_base.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 MODULE_DESCRIPTION("SHA-384/SHA-512 secure hash for arm64");
 MODULE_AUTHOR("Andy Polyakov <appro@openssl.org>");
@@ -20,7 +20,6 @@ MODULE_ALIAS_CRYPTO("sha512");
 
 asmlinkage void sha512_block_data_order(u64 *digest, const void *data,
                                        unsigned int num_blks);
-EXPORT_SYMBOL(sha512_block_data_order);
 
 static void sha512_arm64_transform(struct sha512_state *sst, u8 const *src,
                                   int blocks)
@@ -31,46 +30,41 @@ static void sha512_arm64_transform(struct sha512_state *sst, u8 const *src,
 static int sha512_update(struct shash_desc *desc, const u8 *data,
                         unsigned int len)
 {
-       return sha512_base_do_update(desc, data, len, sha512_arm64_transform);
+       return sha512_base_do_update_blocks(desc, data, len,
+                                           sha512_arm64_transform);
 }
 
 static int sha512_finup(struct shash_desc *desc, const u8 *data,
                        unsigned int len, u8 *out)
 {
-       if (len)
-               sha512_base_do_update(desc, data, len, sha512_arm64_transform);
-       sha512_base_do_finalize(desc, sha512_arm64_transform);
-
+       sha512_base_do_finup(desc, data, len, sha512_arm64_transform);
        return sha512_base_finish(desc, out);
 }
 
-static int sha512_final(struct shash_desc *desc, u8 *out)
-{
-       return sha512_finup(desc, NULL, 0, out);
-}
-
 static struct shash_alg algs[] = { {
        .digestsize             = SHA512_DIGEST_SIZE,
        .init                   = sha512_base_init,
        .update                 = sha512_update,
-       .final                  = sha512_final,
        .finup                  = sha512_finup,
-       .descsize               = sizeof(struct sha512_state),
+       .descsize               = SHA512_STATE_SIZE,
        .base.cra_name          = "sha512",
        .base.cra_driver_name   = "sha512-arm64",
        .base.cra_priority      = 150,
+       .base.cra_flags         = CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                 CRYPTO_AHASH_ALG_FINUP_MAX,
        .base.cra_blocksize     = SHA512_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
        .digestsize             = SHA384_DIGEST_SIZE,
        .init                   = sha384_base_init,
        .update                 = sha512_update,
-       .final                  = sha512_final,
        .finup                  = sha512_finup,
-       .descsize               = sizeof(struct sha512_state),
+       .descsize               = SHA512_STATE_SIZE,
        .base.cra_name          = "sha384",
        .base.cra_driver_name   = "sha384-arm64",
        .base.cra_priority      = 150,
+       .base.cra_flags         = CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                 CRYPTO_AHASH_ALG_FINUP_MAX,
        .base.cra_blocksize     = SHA384_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 } };