kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/lib/crypto/blake2s.c
..
..
@@ -16,62 +16,19 @@
16
16
 #include <linux/init.h>
17
17
 #include <linux/bug.h>
18
18
 
19
-#if IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S)
20
-#  define blake2s_compress blake2s_compress_arch
21
-#else
22
-#  define blake2s_compress blake2s_compress_generic
23
-#endif
24
-
25
19
 void blake2s_update(struct blake2s_state *state, const u8 *in, size_t inlen)
26
20
 {
27
-	__blake2s_update(state, in, inlen, blake2s_compress);
21
+	__blake2s_update(state, in, inlen, false);
28
22
 }
29
23
 EXPORT_SYMBOL(blake2s_update);
30
24
 
31
25
 void blake2s_final(struct blake2s_state *state, u8 *out)
32
26
 {
33
27
 	WARN_ON(IS_ENABLED(DEBUG) && !out);
34
-	__blake2s_final(state, out, blake2s_compress);
28
+	__blake2s_final(state, out, false);
35
29
 	memzero_explicit(state, sizeof(*state));
36
30
 }
37
31
 EXPORT_SYMBOL(blake2s_final);
38
-
39
-void blake2s256_hmac(u8 *out, const u8 *in, const u8 *key, const size_t inlen,
40
-		     const size_t keylen)
41
-{
42
-	struct blake2s_state state;
43
-	u8 x_key[BLAKE2S_BLOCK_SIZE] __aligned(__alignof__(u32)) = { 0 };
44
-	u8 i_hash[BLAKE2S_HASH_SIZE] __aligned(__alignof__(u32));
45
-	int i;
46
-
47
-	if (keylen > BLAKE2S_BLOCK_SIZE) {
48
-		blake2s_init(&state, BLAKE2S_HASH_SIZE);
49
-		blake2s_update(&state, key, keylen);
50
-		blake2s_final(&state, x_key);
51
-	} else
52
-		memcpy(x_key, key, keylen);
53
-
54
-	for (i = 0; i < BLAKE2S_BLOCK_SIZE; ++i)
55
-		x_key[i] ^= 0x36;
56
-
57
-	blake2s_init(&state, BLAKE2S_HASH_SIZE);
58
-	blake2s_update(&state, x_key, BLAKE2S_BLOCK_SIZE);
59
-	blake2s_update(&state, in, inlen);
60
-	blake2s_final(&state, i_hash);
61
-
62
-	for (i = 0; i < BLAKE2S_BLOCK_SIZE; ++i)
63
-		x_key[i] ^= 0x5c ^ 0x36;
64
-
65
-	blake2s_init(&state, BLAKE2S_HASH_SIZE);
66
-	blake2s_update(&state, x_key, BLAKE2S_BLOCK_SIZE);
67
-	blake2s_update(&state, i_hash, BLAKE2S_HASH_SIZE);
68
-	blake2s_final(&state, i_hash);
69
-
70
-	memcpy(out, i_hash, BLAKE2S_HASH_SIZE);
71
-	memzero_explicit(x_key, BLAKE2S_BLOCK_SIZE);
72
-	memzero_explicit(i_hash, BLAKE2S_HASH_SIZE);
73
-}
74
-EXPORT_SYMBOL(blake2s256_hmac);
75
32
 
76
33
 static int __init mod_init(void)
77
34
 {