Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: riscv/sm3 - Use API partial block handling
Use the Crypto API partial block handling.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+17
-32
+17
-32
arch/riscv/crypto/sm3-riscv64-glue.c
+17
-32
arch/riscv/crypto/sm3-riscv64-glue.c
···
13
13
#include <asm/vector.h>
14
14
#include <crypto/internal/hash.h>
15
15
#include <crypto/internal/simd.h>
16
+
#include <crypto/sm3.h>
16
17
#include <crypto/sm3_base.h>
17
-
#include <linux/linkage.h>
18
+
#include <linux/kernel.h>
18
19
#include <linux/module.h>
19
20
20
21
/*
···
25
24
asmlinkage void sm3_transform_zvksh_zvkb(
26
25
struct sm3_state *state, const u8 *data, int num_blocks);
27
26
28
-
static int riscv64_sm3_update(struct shash_desc *desc, const u8 *data,
29
-
unsigned int len)
27
+
static void sm3_block(struct sm3_state *state, const u8 *data,
28
+
int num_blocks)
30
29
{
31
30
/*
32
31
* Ensure struct sm3_state begins directly with the SM3
···
36
35
37
36
if (crypto_simd_usable()) {
38
37
kernel_vector_begin();
39
-
sm3_base_do_update(desc, data, len, sm3_transform_zvksh_zvkb);
38
+
sm3_transform_zvksh_zvkb(state, data, num_blocks);
40
39
kernel_vector_end();
41
40
} else {
42
-
sm3_update(shash_desc_ctx(desc), data, len);
41
+
sm3_block_generic(state, data, num_blocks);
43
42
}
44
-
return 0;
43
+
}
44
+
45
+
static int riscv64_sm3_update(struct shash_desc *desc, const u8 *data,
46
+
unsigned int len)
47
+
{
48
+
return sm3_base_do_update_blocks(desc, data, len, sm3_block);
45
49
}
46
50
47
51
static int riscv64_sm3_finup(struct shash_desc *desc, const u8 *data,
48
52
unsigned int len, u8 *out)
49
53
{
50
-
struct sm3_state *ctx;
51
-
52
-
if (crypto_simd_usable()) {
53
-
kernel_vector_begin();
54
-
if (len)
55
-
sm3_base_do_update(desc, data, len,
56
-
sm3_transform_zvksh_zvkb);
57
-
sm3_base_do_finalize(desc, sm3_transform_zvksh_zvkb);
58
-
kernel_vector_end();
59
-
60
-
return sm3_base_finish(desc, out);
61
-
}
62
-
63
-
ctx = shash_desc_ctx(desc);
64
-
if (len)
65
-
sm3_update(ctx, data, len);
66
-
sm3_final(ctx, out);
67
-
68
-
return 0;
69
-
}
70
-
71
-
static int riscv64_sm3_final(struct shash_desc *desc, u8 *out)
72
-
{
73
-
return riscv64_sm3_finup(desc, NULL, 0, out);
54
+
sm3_base_do_finup(desc, data, len, sm3_block);
55
+
return sm3_base_finish(desc, out);
74
56
}
75
57
76
58
static struct shash_alg riscv64_sm3_alg = {
77
59
.init = sm3_base_init,
78
60
.update = riscv64_sm3_update,
79
-
.final = riscv64_sm3_final,
80
61
.finup = riscv64_sm3_finup,
81
-
.descsize = sizeof(struct sm3_state),
62
+
.descsize = SM3_STATE_SIZE,
82
63
.digestsize = SM3_DIGEST_SIZE,
83
64
.base = {
84
65
.cra_blocksize = SM3_BLOCK_SIZE,
66
+
.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY |
67
+
CRYPTO_AHASH_ALG_FINUP_MAX,
85
68
.cra_priority = 300,
86
69
.cra_name = "sm3",
87
70
.cra_driver_name = "sm3-riscv64-zvksh-zvkb",