Skip to content

Commit b80c0b9

Browse files
sbabictrini
authored andcommitted
Rename aes.h to uboot_aes.h
aes.h is a too generic name if this file can be exported and used by a program. Rename it to avoid any conflicts with other files (for example, from openSSL). Signed-off-by: Stefano Babic <[email protected]>
1 parent 40a808f commit b80c0b9

File tree

6 files changed

+5
-5
lines changed

6 files changed

+5
-5
lines changed

arch/arm/mach-tegra/tegra20/crypto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <common.h>
99
#include <linux/errno.h>
1010
#include "crypto.h"
11-
#include "aes.h"
11+
#include "uboot_aes.h"
1212

1313
static u8 zero_key[16];
1414

cmd/aes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <common.h>
1010
#include <command.h>
1111
#include <environment.h>
12-
#include <aes.h>
12+
#include <uboot_aes.h>
1313
#include <malloc.h>
1414
#include <asm/byteorder.h>
1515
#include <linux/compiler.h>

common/env_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ int set_default_vars(int nvars, char * const vars[])
140140
}
141141

142142
#ifdef CONFIG_ENV_AES
143-
#include <aes.h>
143+
#include <uboot_aes.h>
144144
/**
145145
* env_aes_cbc_get_key() - Get AES-128-CBC key for the environment
146146
*
File renamed without changes.

lib/aes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#else
2828
#include <string.h>
2929
#endif
30-
#include "aes.h"
30+
#include "uboot_aes.h"
3131

3232
/* forward s-box */
3333
static const u8 sbox[256] = {

tools/env/fw_env.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: GPL-2.0+
66
*/
77

8-
#include <aes.h>
8+
#include <uboot_aes.h>
99
#include <stdint.h>
1010

1111
/* Pull in the current config to define the default environment */

0 commit comments

Comments
 (0)