smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aes: Use const pointers for read-only parameters

Browse Source 
Update AES function signatures to use const pointers for parameters that
are not modified. This improves type safety and makes it easier to see
which parameters are read-only.

Fix the Nuvoton npcm_ae driver as well since it implements the API.
Really that should be handled by a driver, but leave that for now.

Functions updated:
- aes_expand_key(): key parameter
- aes_encrypt(): in and expkey parameters
- aes_decrypt(): in and expkey parameters
- aes_apply_cbc_chain_data(): cbc_chain_data and src parameters
- aes_cbc_encrypt_blocks(): key_exp, iv, and src parameters
- aes_cbc_decrypt_blocks(): key_exp, iv, and src parameters
- add_round_key(): key parameter (internal)
- debug_print_vector(): data parameter (internal)

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass
2025-11-14 11:28:34 -07:00
parent 33f5f5cb3f
commit 76aa68ed86
3 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/aes.c
View File

@@ -498,7 +498,7 @@ static void inv_mix_sub_columns(u8 *state)
* encrypt/decrypt columns of the key
* n.b. you can replace this with byte-wise xor if you wish.
*/
static void add_round_key(u32 *state, u32 *key)
static void add_round_key(u32 *state, const u32 *key)
{
int idx;
@@ -537,7 +537,7 @@ static u32 aes_get_keycols(u32 key_len)
}
/* produce AES_STATECOLS bytes for each round */
void aes_expand_key(u8 *key, u32 key_len, u8 *expkey)
void aes_expand_key(const u8 *key, u32 key_len, u8 *expkey)
{
u8 tmp0, tmp1, tmp2, tmp3, tmp4;
uint idx, aes_rounds, aes_keycols;
@@ -574,7 +574,7 @@ void aes_expand_key(u8 *key, u32 key_len, u8 *expkey)
}
/* encrypt one 128 bit block */
void aes_encrypt(u32 key_len, u8 *in, u8 *expkey, u8 *out)
void aes_encrypt(u32 key_len, const u8 *in, const u8 *expkey, u8 *out)
{
u8 state[AES_STATECOLS * 4];
u32 round, aes_rounds;
@@ -597,7 +597,7 @@ void aes_encrypt(u32 key_len, u8 *in, u8 *expkey, u8 *out)
memcpy(out, state, sizeof(state));
}
void aes_decrypt(u32 key_len, u8 *in, u8 *expkey, u8 *out)
void aes_decrypt(u32 key_len, const u8 *in, const u8 *expkey, u8 *out)
{
u8 state[AES_STATECOLS * 4];
int round, aes_rounds;
@@ -620,7 +620,7 @@ void aes_decrypt(u32 key_len, u8 *in, u8 *expkey, u8 *out)
memcpy(out, state, sizeof(state));
}
static void debug_print_vector(char *name, u32 num_bytes, u8 *data)
static void debug_print_vector(char *name, u32 num_bytes, const u8 *data)
{
#ifdef DEBUG
printf("%s [%d] @0x%p", name, num_bytes, data);
@@ -628,7 +628,7 @@ static void debug_print_vector(char *name, u32 num_bytes, u8 *data)
#endif
}
void aes_apply_cbc_chain_data(u8 *cbc_chain_data, u8 *src, u8 *dst)
void aes_apply_cbc_chain_data(const u8 *cbc_chain_data, const u8 *src, u8 *dst)
{
int i;
@@ -636,11 +636,11 @@ void aes_apply_cbc_chain_data(u8 *cbc_chain_data, u8 *src, u8 *dst)
*dst++ = *src++ ^ *cbc_chain_data++;
}
void aes_cbc_encrypt_blocks(u32 key_len, u8 *key_exp, u8 *iv, u8 *src, u8 *dst,
u32 num_aes_blocks)
void aes_cbc_encrypt_blocks(u32 key_len, const u8 *key_exp, const u8 *iv,
const u8 *src, u8 *dst, u32 num_aes_blocks)
{
u8 tmp_data[AES_BLOCK_LENGTH];
u8 *cbc_chain_data = iv;
const u8 *cbc_chain_data = iv;
u32 i;
for (i = 0; i < num_aes_blocks; i++) {
@@ -662,8 +662,8 @@ void aes_cbc_encrypt_blocks(u32 key_len, u8 *key_exp, u8 *iv, u8 *src, u8 *dst,
}
}
void aes_cbc_decrypt_blocks(u32 key_len, u8 *key_exp, u8 *iv, u8 *src, u8 *dst,
u32 num_aes_blocks)
void aes_cbc_decrypt_blocks(u32 key_len, const u8 *key_exp, const u8 *iv,
const u8 *src, u8 *dst, u32 num_aes_blocks)
{
u8 tmp_data[AES_BLOCK_LENGTH], tmp_block[AES_BLOCK_LENGTH];
/* Convenient array of 0's for IV */