crypto: sm3-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/sm3_generic.c b/crypto/sm3_generic.c
index a2d23a46924eabf68f670b4a27516916e55deb0d..4fb6957c2f0c9861bc08b1a6be2df157bef24192 100644 (file)
--- a/crypto/sm3_generic.c
+++ b/crypto/sm3_generic.c
@@ -9,15 +9,10 @@
  */
 
 #include <crypto/internal/hash.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/types.h>
 #include <crypto/sm3.h>
 #include <crypto/sm3_base.h>
-#include <linux/bitops.h>
-#include <asm/byteorder.h>
-#include <linux/unaligned.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 const u8 sm3_zero_message_hash[SM3_DIGEST_SIZE] = {
        0x1A, 0xB2, 0x1D, 0x83, 0x55, 0xCF, 0xA1, 0x7F,
@@ -30,38 +25,28 @@ EXPORT_SYMBOL_GPL(sm3_zero_message_hash);
 static int crypto_sm3_update(struct shash_desc *desc, const u8 *data,
                          unsigned int len)
 {
-       sm3_update(shash_desc_ctx(desc), data, len);
-       return 0;
-}
-
-static int crypto_sm3_final(struct shash_desc *desc, u8 *out)
-{
-       sm3_final(shash_desc_ctx(desc), out);
-       return 0;
+       return sm3_base_do_update_blocks(desc, data, len, sm3_block_generic);
 }
 
 static int crypto_sm3_finup(struct shash_desc *desc, const u8 *data,
                        unsigned int len, u8 *hash)
 {
-       struct sm3_state *sctx = shash_desc_ctx(desc);
-
-       if (len)
-               sm3_update(sctx, data, len);
-       sm3_final(sctx, hash);
-       return 0;
+       sm3_base_do_finup(desc, data, len, sm3_block_generic);
+       return sm3_base_finish(desc, hash);
 }
 
 static struct shash_alg sm3_alg = {
        .digestsize     =       SM3_DIGEST_SIZE,
        .init           =       sm3_base_init,
        .update         =       crypto_sm3_update,
-       .final          =       crypto_sm3_final,
        .finup          =       crypto_sm3_finup,
-       .descsize       =       sizeof(struct sm3_state),
+       .descsize       =       SM3_STATE_SIZE,
        .base           =       {
                .cra_name        =      "sm3",
                .cra_driver_name =      "sm3-generic",
                .cra_priority   =       100,
+               .cra_flags       =      CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                       CRYPTO_AHASH_ALG_FINUP_MAX,
                .cra_blocksize   =      SM3_BLOCK_SIZE,
                .cra_module      =      THIS_MODULE,
        }

diff --git a/include/crypto/sm3.h b/include/crypto/sm3.h
index d49211ba9a2002e494c62c08d0e775561591eb2d..6dc95264a8366425163fc3a74c30981368e57b04 100644 (file)
--- a/include/crypto/sm3.h
+++ b/include/crypto/sm3.h
@@ -14,6 +14,7 @@
 
 #define SM3_DIGEST_SIZE        32
 #define SM3_BLOCK_SIZE 64
+#define SM3_STATE_SIZE 40
 
 #define SM3_T1         0x79CC4519
 #define SM3_T2         0x7A879D8A

diff --git a/include/crypto/sm3_base.h b/include/crypto/sm3_base.h
index 835896228e8eaba400fbe50291b1cb7137b61209..9460589c8cb8c73c21176165203af7c9f3745293 100644 (file)
--- a/include/crypto/sm3_base.h
+++ b/include/crypto/sm3_base.h
@@ -62,6 +62,49 @@ static inline int sm3_base_do_update(struct shash_desc *desc,
        return 0;
 }
 
+static inline int sm3_base_do_update_blocks(struct shash_desc *desc,
+                                           const u8 *data, unsigned int len,
+                                           sm3_block_fn *block_fn)
+{
+       unsigned int remain = len - round_down(len, SM3_BLOCK_SIZE);
+       struct sm3_state *sctx = shash_desc_ctx(desc);
+
+       sctx->count += len - remain;
+       block_fn(sctx, data, len / SM3_BLOCK_SIZE);
+       return remain;
+}
+
+static inline int sm3_base_do_finup(struct shash_desc *desc,
+                                   const u8 *src, unsigned int len,
+                                   sm3_block_fn *block_fn)
+{
+       unsigned int bit_offset = SM3_BLOCK_SIZE / 8 - 1;
+       struct sm3_state *sctx = shash_desc_ctx(desc);
+       union {
+               __be64 b64[SM3_BLOCK_SIZE / 4];
+               u8 u8[SM3_BLOCK_SIZE * 2];
+       } block = {};
+
+       if (len >= SM3_BLOCK_SIZE) {
+               int remain;
+
+               remain = sm3_base_do_update_blocks(desc, src, len, block_fn);
+               src += len - remain;
+               len = remain;
+       }
+
+       if (len >= bit_offset * 8)
+               bit_offset += SM3_BLOCK_SIZE / 8;
+       memcpy(&block, src, len);
+       block.u8[len] = 0x80;
+       sctx->count += len;
+       block.b64[bit_offset] = cpu_to_be64(sctx->count << 3);
+       block_fn(sctx, block.u8, (bit_offset + 1) * 8 / SM3_BLOCK_SIZE);
+       memzero_explicit(&block, sizeof(block));
+
+       return 0;
+}
+
 static inline int sm3_base_do_finalize(struct shash_desc *desc,
                                        sm3_block_fn *block_fn)
 {
@@ -93,8 +136,6 @@ static inline int sm3_base_finish(struct shash_desc *desc, u8 *out)
 
        for (i = 0; i < SM3_DIGEST_SIZE / sizeof(__be32); i++)
                put_unaligned_be32(sctx->state[i], digest++);
-
-       memzero_explicit(sctx, sizeof(*sctx));
        return 0;
 }