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>
This commit is contained in:
Eric Biggers 2026-01-12 11:19:59 -08:00
parent 959a634ebc
commit b599aacf12
6 changed files with 22 additions and 21 deletions

View File

@ -44,7 +44,7 @@ asmlinkage void gcm_ghash_p10(unsigned char *Xi, unsigned char *Htable,
unsigned char *aad, unsigned int alen);
asmlinkage void gcm_update(u8 *iv, void *Xi);
struct aes_key {
struct p10_aes_key {
u8 key[AES_MAX_KEYLENGTH];
u64 rounds;
};
@ -63,7 +63,7 @@ struct Hash_ctx {
};
struct p10_aes_gcm_ctx {
struct aes_key enc_key;
struct p10_aes_key enc_key;
u8 nonce[RFC4106_NONCE_SIZE];
};

View File

@ -21,8 +21,8 @@
struct p8_aes_ctx {
struct crypto_cipher *fallback;
struct aes_key enc_key;
struct aes_key dec_key;
struct p8_aes_key enc_key;
struct p8_aes_key dec_key;
};
static int p8_aes_init(struct crypto_tfm *tfm)

View File

@ -21,8 +21,8 @@
struct p8_aes_cbc_ctx {
struct crypto_skcipher *fallback;
struct aes_key enc_key;
struct aes_key dec_key;
struct p8_aes_key enc_key;
struct p8_aes_key dec_key;
};
static int p8_aes_cbc_init(struct crypto_skcipher *tfm)

View File

@ -21,7 +21,7 @@
struct p8_aes_ctr_ctx {
struct crypto_skcipher *fallback;
struct aes_key enc_key;
struct p8_aes_key enc_key;
};
static int p8_aes_ctr_init(struct crypto_skcipher *tfm)

View File

@ -22,9 +22,9 @@
struct p8_aes_xts_ctx {
struct crypto_skcipher *fallback;
struct aes_key enc_key;
struct aes_key dec_key;
struct aes_key tweak_key;
struct p8_aes_key enc_key;
struct p8_aes_key dec_key;
struct p8_aes_key tweak_key;
};
static int p8_aes_xts_init(struct crypto_skcipher *tfm)

View File

@ -2,7 +2,7 @@
#include <linux/types.h>
#include <crypto/aes.h>
struct aes_key {
struct p8_aes_key {
u8 key[AES_MAX_KEYLENGTH];
int rounds;
};
@ -14,17 +14,18 @@ extern struct skcipher_alg p8_aes_ctr_alg;
extern struct skcipher_alg p8_aes_xts_alg;
int aes_p8_set_encrypt_key(const u8 *userKey, const int bits,
struct aes_key *key);
struct p8_aes_key *key);
int aes_p8_set_decrypt_key(const u8 *userKey, const int bits,
struct aes_key *key);
void aes_p8_encrypt(const u8 *in, u8 *out, const struct aes_key *key);
void aes_p8_decrypt(const u8 *in, u8 *out, const struct aes_key *key);
struct p8_aes_key *key);
void aes_p8_encrypt(const u8 *in, u8 *out, const struct p8_aes_key *key);
void aes_p8_decrypt(const u8 *in, u8 *out, const struct p8_aes_key *key);
void aes_p8_cbc_encrypt(const u8 *in, u8 *out, size_t len,
const struct aes_key *key, u8 *iv, const int enc);
void aes_p8_ctr32_encrypt_blocks(const u8 *in, u8 *out,
size_t len, const struct aes_key *key,
const u8 *iv);
const struct p8_aes_key *key, u8 *iv, const int enc);
void aes_p8_ctr32_encrypt_blocks(const u8 *in, u8 *out, size_t len,
const struct p8_aes_key *key, const u8 *iv);
void aes_p8_xts_encrypt(const u8 *in, u8 *out, size_t len,
const struct aes_key *key1, const struct aes_key *key2, u8 *iv);
const struct p8_aes_key *key1,
const struct p8_aes_key *key2, u8 *iv);
void aes_p8_xts_decrypt(const u8 *in, u8 *out, size_t len,
const struct aes_key *key1, const struct aes_key *key2, u8 *iv);
const struct p8_aes_key *key1,
const struct p8_aes_key *key2, u8 *iv);