crypto: sm3 - Remove 'struct sm3_state'

Update one driver that used sizeof(struct sm3_state) to use
sizeof(struct sm3_ctx) instead.  Then, remove struct sm3_state and
SM3_STATE_SIZE.

This completes the replacement of struct sm3_state with struct sm3_ctx.

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20260321040935.410034-13-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

diff --git a/drivers/crypto/starfive/jh7110-hash.c b/drivers/crypto/starfive/jh7110-hash.c
index 742038a5201acddb8dc1809e01cded63ac231043..008a47baa1657c3a8fc562f1e615bd1f206b8856 100644 (file)
--- a/drivers/crypto/starfive/jh7110-hash.c
+++ b/drivers/crypto/starfive/jh7110-hash.c
@@ -795,7 +795,7 @@ static struct ahash_engine_alg algs_sha2_sm3[] = {
        .base.exit_tfm = starfive_hash_exit_tfm,
        .base.halg = {
                .digestsize = SM3_DIGEST_SIZE,
-               .statesize  = sizeof(struct sm3_state),
+               .statesize  = sizeof(struct sm3_ctx),
                .base = {
                        .cra_name               = "sm3",
                        .cra_driver_name        = "sm3-starfive",
@@ -824,7 +824,7 @@ static struct ahash_engine_alg algs_sha2_sm3[] = {
        .base.setkey      = starfive_hash_setkey,
        .base.halg = {
                .digestsize = SM3_DIGEST_SIZE,
-               .statesize  = sizeof(struct sm3_state),
+               .statesize  = sizeof(struct sm3_ctx),
                .base = {
                        .cra_name               = "hmac(sm3)",
                        .cra_driver_name        = "sm3-hmac-starfive",

diff --git a/include/crypto/sm3.h b/include/crypto/sm3.h
index 34d7eb32b7dbf844586907d16f15679ec33db53b..371e8a6617054676a814b86823fbd89e0dcd1a93 100644 (file)
--- a/include/crypto/sm3.h
+++ b/include/crypto/sm3.h
@@ -14,7 +14,6 @@
 
 #define SM3_DIGEST_SIZE        32
 #define SM3_BLOCK_SIZE 64
-#define SM3_STATE_SIZE 40
 
 #define SM3_IVA                0x7380166f
 #define SM3_IVB                0x4914b2b9
@@ -25,12 +24,6 @@
 #define SM3_IVG                0xe38dee4d
 #define SM3_IVH                0xb0fb0e4e
 
-struct sm3_state {
-       u32 state[SM3_DIGEST_SIZE / 4];
-       u64 count;
-       u8 buffer[SM3_BLOCK_SIZE];
-};
-
 /* State for the SM3 compression function */
 struct sm3_block_state {
        u32 h[SM3_DIGEST_SIZE / 4];