diff options
| author | Stefano Babic <sbabic@denx.de> | 2017-04-05 16:08:00 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-12 17:28:27 (GMT) |
| commit | b80c0b99347c52884cccc7c09775942acbcc0739 (patch) | |
| tree | efbfa25463deb03934fed40afa015e51cf8bebf5 | |
| parent | 40a808f173008729a0c631ab84693b6a2b0dcfc9 (diff) | |
| download | u-boot-b80c0b99347c52884cccc7c09775942acbcc0739.tar.xz | |
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 <sbabic@denx.de>
| -rw-r--r-- | arch/arm/mach-tegra/tegra20/crypto.c | 2 | ||||
| -rw-r--r-- | cmd/aes.c | 2 | ||||
| -rw-r--r-- | common/env_common.c | 2 | ||||
| -rw-r--r-- | include/uboot_aes.h (renamed from include/aes.h) | 0 | ||||
| -rw-r--r-- | lib/aes.c | 2 | ||||
| -rw-r--r-- | tools/env/fw_env.h | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/tegra20/crypto.c b/arch/arm/mach-tegra/tegra20/crypto.c index 1b82fbb..eae7921 100644 --- a/arch/arm/mach-tegra/tegra20/crypto.c +++ b/arch/arm/mach-tegra/tegra20/crypto.c @@ -8,7 +8,7 @@ #include <common.h> #include <linux/errno.h> #include "crypto.h" -#include "aes.h" +#include "uboot_aes.h" static u8 zero_key[16]; @@ -9,7 +9,7 @@ #include <common.h> #include <command.h> #include <environment.h> -#include <aes.h> +#include <uboot_aes.h> #include <malloc.h> #include <asm/byteorder.h> #include <linux/compiler.h> diff --git a/common/env_common.c b/common/env_common.c index 7fb62e8..6845f8d 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -140,7 +140,7 @@ int set_default_vars(int nvars, char * const vars[]) } #ifdef CONFIG_ENV_AES -#include <aes.h> +#include <uboot_aes.h> /** * env_aes_cbc_get_key() - Get AES-128-CBC key for the environment * diff --git a/include/aes.h b/include/uboot_aes.h index 6315c02..6315c02 100644 --- a/include/aes.h +++ b/include/uboot_aes.h @@ -27,7 +27,7 @@ #else #include <string.h> #endif -#include "aes.h" +#include "uboot_aes.h" /* forward s-box */ static const u8 sbox[256] = { diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 05588ab..0d7130a 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include <aes.h> +#include <uboot_aes.h> #include <stdint.h> /* Pull in the current config to define the default environment */ |