crypto: riscv/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/riscv/crypto/sha512-riscv64-glue.c b/arch/riscv/crypto/sha512-riscv64-glue.c
index 43b56a08aeb51af49d00c050e3e16444e3a05c1c..4634fca78ae249ef66af1fc6f0be9d7a9cd2a8b8 100644 (file)
--- a/arch/riscv/crypto/sha512-riscv64-glue.c
+++ b/arch/riscv/crypto/sha512-riscv64-glue.c
@@ -14,7 +14,7 @@
 #include <crypto/internal/hash.h>
 #include <crypto/internal/simd.h>
 #include <crypto/sha512_base.h>
-#include <linux/linkage.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
 
 /*
@@ -24,8 +24,8 @@
 asmlinkage void sha512_transform_zvknhb_zvkb(
        struct sha512_state *state, const u8 *data, int num_blocks);
 
-static int riscv64_sha512_update(struct shash_desc *desc, const u8 *data,
-                                unsigned int len)
+static void sha512_block(struct sha512_state *state, const u8 *data,
+                        int num_blocks)
 {
        /*
         * Ensure struct sha512_state begins directly with the SHA-512
@@ -35,35 +35,24 @@ static int riscv64_sha512_update(struct shash_desc *desc, const u8 *data,
 
        if (crypto_simd_usable()) {
                kernel_vector_begin();
-               sha512_base_do_update(desc, data, len,
-                                     sha512_transform_zvknhb_zvkb);
+               sha512_transform_zvknhb_zvkb(state, data, num_blocks);
                kernel_vector_end();
        } else {
-               crypto_sha512_update(desc, data, len);
+               sha512_generic_block_fn(state, data, num_blocks);
        }
-       return 0;
 }
 
-static int riscv64_sha512_finup(struct shash_desc *desc, const u8 *data,
-                               unsigned int len, u8 *out)
+static int riscv64_sha512_update(struct shash_desc *desc, const u8 *data,
+                                unsigned int len)
 {
-       if (crypto_simd_usable()) {
-               kernel_vector_begin();
-               if (len)
-                       sha512_base_do_update(desc, data, len,
-                                             sha512_transform_zvknhb_zvkb);
-               sha512_base_do_finalize(desc, sha512_transform_zvknhb_zvkb);
-               kernel_vector_end();
-
-               return sha512_base_finish(desc, out);
-       }
-
-       return crypto_sha512_finup(desc, data, len, out);
+       return sha512_base_do_update_blocks(desc, data, len, sha512_block);
 }
 
-static int riscv64_sha512_final(struct shash_desc *desc, u8 *out)
+static int riscv64_sha512_finup(struct shash_desc *desc, const u8 *data,
+                               unsigned int len, u8 *out)
 {
-       return riscv64_sha512_finup(desc, NULL, 0, out);
+       sha512_base_do_finup(desc, data, len, sha512_block);
+       return sha512_base_finish(desc, out);
 }
 
 static int riscv64_sha512_digest(struct shash_desc *desc, const u8 *data,
@@ -77,14 +66,15 @@ static struct shash_alg riscv64_sha512_algs[] = {
        {
                .init = sha512_base_init,
                .update = riscv64_sha512_update,
-               .final = riscv64_sha512_final,
                .finup = riscv64_sha512_finup,
                .digest = riscv64_sha512_digest,
-               .descsize = sizeof(struct sha512_state),
+               .descsize = SHA512_STATE_SIZE,
                .digestsize = SHA512_DIGEST_SIZE,
                .base = {
                        .cra_blocksize = SHA512_BLOCK_SIZE,
                        .cra_priority = 300,
+                       .cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                    CRYPTO_AHASH_ALG_FINUP_MAX,
                        .cra_name = "sha512",
                        .cra_driver_name = "sha512-riscv64-zvknhb-zvkb",
                        .cra_module = THIS_MODULE,
@@ -92,13 +82,14 @@ static struct shash_alg riscv64_sha512_algs[] = {
        }, {
                .init = sha384_base_init,
                .update = riscv64_sha512_update,
-               .final = riscv64_sha512_final,
                .finup = riscv64_sha512_finup,
-               .descsize = sizeof(struct sha512_state),
+               .descsize = SHA512_STATE_SIZE,
                .digestsize = SHA384_DIGEST_SIZE,
                .base = {
                        .cra_blocksize = SHA384_BLOCK_SIZE,
                        .cra_priority = 300,
+                       .cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                    CRYPTO_AHASH_ALG_FINUP_MAX,
                        .cra_name = "sha384",
                        .cra_driver_name = "sha384-riscv64-zvknhb-zvkb",
                        .cra_module = THIS_MODULE,

diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
index ed81813bd4201331ecab1c1b742f1466a65913ea..27a7346ff143510f1aef4afe702db21dd3a013ae 100644 (file)
--- a/crypto/sha512_generic.c
+++ b/crypto/sha512_generic.c
@@ -145,14 +145,15 @@ sha512_transform(u64 *state, const u8 *input)
        state[4] += e; state[5] += f; state[6] += g; state[7] += h;
 }
 
-static void sha512_generic_block_fn(struct sha512_state *sst, u8 const *src,
-                                   int blocks)
+void sha512_generic_block_fn(struct sha512_state *sst, u8 const *src,
+                            int blocks)
 {
        while (blocks--) {
                sha512_transform(sst->state, src);
                src += SHA512_BLOCK_SIZE;
        }
 }
+EXPORT_SYMBOL_GPL(sha512_generic_block_fn);
 
 int crypto_sha512_update(struct shash_desc *desc, const u8 *data,
                        unsigned int len)

diff --git a/include/crypto/sha512_base.h b/include/crypto/sha512_base.h
index 8cb172e52dc0be83ba6dfc601960702fd14f54f9..e9f302ec3ede559edf1884e0c6e61c838ca1d795 100644 (file)
--- a/include/crypto/sha512_base.h
+++ b/include/crypto/sha512_base.h
@@ -10,7 +10,10 @@
 
 #include <crypto/internal/hash.h>
 #include <crypto/sha2.h>
+#include <linux/compiler.h>
+#include <linux/math.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/unaligned.h>
 
 typedef void (sha512_block_fn)(struct sha512_state *sst, u8 const *src,
@@ -175,4 +178,7 @@ static inline int sha512_base_finish(struct shash_desc *desc, u8 *out)
        return 0;
 }
 
+void sha512_generic_block_fn(struct sha512_state *sst, u8 const *src,
+                            int blocks);
+
 #endif /* _CRYPTO_SHA512_BASE_H */