Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: powerpc/aes - Rename struct aes_key
Rename struct aes_key in aesp8-ppc.h and aes-gcm-p10-glue.c to
p8_aes_key and p10_aes_key, respectively. This frees up the name to use
in the library API in <crypto/aes.h>.
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20260112192035.10427-2-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
+22
-21
+2
-2
arch/powerpc/crypto/aes-gcm-p10-glue.c
+2
-2
arch/powerpc/crypto/aes-gcm-p10-glue.c
···
44
44
unsigned char *aad, unsigned int alen);
45
45
asmlinkage void gcm_update(u8 *iv, void *Xi);
46
46
47
-
struct aes_key {
47
+
struct p10_aes_key {
48
48
u8 key[AES_MAX_KEYLENGTH];
49
49
u64 rounds;
50
50
};
···
63
63
};
64
64
65
65
struct p10_aes_gcm_ctx {
66
-
struct aes_key enc_key;
66
+
struct p10_aes_key enc_key;
67
67
u8 nonce[RFC4106_NONCE_SIZE];
68
68
};
69
69
+2
-2
arch/powerpc/crypto/aes.c
+2
-2
arch/powerpc/crypto/aes.c
+2
-2
arch/powerpc/crypto/aes_cbc.c
+2
-2
arch/powerpc/crypto/aes_cbc.c
+1
-1
arch/powerpc/crypto/aes_ctr.c
+1
-1
arch/powerpc/crypto/aes_ctr.c
+3
-3
arch/powerpc/crypto/aes_xts.c
+3
-3
arch/powerpc/crypto/aes_xts.c
···
22
22
23
23
struct p8_aes_xts_ctx {
24
24
struct crypto_skcipher *fallback;
25
-
struct aes_key enc_key;
26
-
struct aes_key dec_key;
27
-
struct aes_key tweak_key;
25
+
struct p8_aes_key enc_key;
26
+
struct p8_aes_key dec_key;
27
+
struct p8_aes_key tweak_key;
28
28
};
29
29
30
30
static int p8_aes_xts_init(struct crypto_skcipher *tfm)
+12
-11
arch/powerpc/crypto/aesp8-ppc.h
+12
-11
arch/powerpc/crypto/aesp8-ppc.h
···
2
2
#include <linux/types.h>
3
3
#include <crypto/aes.h>
4
4
5
-
struct aes_key {
5
+
struct p8_aes_key {
6
6
u8 key[AES_MAX_KEYLENGTH];
7
7
int rounds;
8
8
};
···
14
14
extern struct skcipher_alg p8_aes_xts_alg;
15
15
16
16
int aes_p8_set_encrypt_key(const u8 *userKey, const int bits,
17
-
struct aes_key *key);
17
+
struct p8_aes_key *key);
18
18
int aes_p8_set_decrypt_key(const u8 *userKey, const int bits,
19
-
struct aes_key *key);
20
-
void aes_p8_encrypt(const u8 *in, u8 *out, const struct aes_key *key);
21
-
void aes_p8_decrypt(const u8 *in, u8 *out, const struct aes_key *key);
19
+
struct p8_aes_key *key);
20
+
void aes_p8_encrypt(const u8 *in, u8 *out, const struct p8_aes_key *key);
21
+
void aes_p8_decrypt(const u8 *in, u8 *out, const struct p8_aes_key *key);
22
22
void aes_p8_cbc_encrypt(const u8 *in, u8 *out, size_t len,
23
-
const struct aes_key *key, u8 *iv, const int enc);
24
-
void aes_p8_ctr32_encrypt_blocks(const u8 *in, u8 *out,
25
-
size_t len, const struct aes_key *key,
26
-
const u8 *iv);
23
+
const struct p8_aes_key *key, u8 *iv, const int enc);
24
+
void aes_p8_ctr32_encrypt_blocks(const u8 *in, u8 *out, size_t len,
25
+
const struct p8_aes_key *key, const u8 *iv);
27
26
void aes_p8_xts_encrypt(const u8 *in, u8 *out, size_t len,
28
-
const struct aes_key *key1, const struct aes_key *key2, u8 *iv);
27
+
const struct p8_aes_key *key1,
28
+
const struct p8_aes_key *key2, u8 *iv);
29
29
void aes_p8_xts_decrypt(const u8 *in, u8 *out, size_t len,
30
-
const struct aes_key *key1, const struct aes_key *key2, u8 *iv);
30
+
const struct p8_aes_key *key1,
31
+
const struct p8_aes_key *key2, u8 *iv);