mirror of
https://github.com/linux-sunxi/u-boot-sunxi.git
synced 2024-02-12 11:16:03 +08:00
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>
This commit is contained in:
@ -8,7 +8,7 @@
|
|||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include "crypto.h"
|
#include "crypto.h"
|
||||||
#include "aes.h"
|
#include "uboot_aes.h"
|
||||||
|
|
||||||
static u8 zero_key[16];
|
static u8 zero_key[16];
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <environment.h>
|
#include <environment.h>
|
||||||
#include <aes.h>
|
#include <uboot_aes.h>
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
|
@ -140,7 +140,7 @@ int set_default_vars(int nvars, char * const vars[])
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_ENV_AES
|
#ifdef CONFIG_ENV_AES
|
||||||
#include <aes.h>
|
#include <uboot_aes.h>
|
||||||
/**
|
/**
|
||||||
* env_aes_cbc_get_key() - Get AES-128-CBC key for the environment
|
* env_aes_cbc_get_key() - Get AES-128-CBC key for the environment
|
||||||
*
|
*
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#else
|
#else
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#endif
|
#endif
|
||||||
#include "aes.h"
|
#include "uboot_aes.h"
|
||||||
|
|
||||||
/* forward s-box */
|
/* forward s-box */
|
||||||
static const u8 sbox[256] = {
|
static const u8 sbox[256] = {
|
||||||
|
2
tools/env/fw_env.h
vendored
2
tools/env/fw_env.h
vendored
@ -5,7 +5,7 @@
|
|||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <aes.h>
|
#include <uboot_aes.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
/* Pull in the current config to define the default environment */
|
/* Pull in the current config to define the default environment */
|
||||||
|
Reference in New Issue
Block a user