Browse Source

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>
Stefano Babic 7 years ago
parent
commit
b80c0b9934
6 changed files with 5 additions and 5 deletions
  1. 1 1
      arch/arm/mach-tegra/tegra20/crypto.c
  2. 1 1
      cmd/aes.c
  3. 1 1
      common/env_common.c
  4. 0 0
      include/uboot_aes.h
  5. 1 1
      lib/aes.c
  6. 1 1
      tools/env/fw_env.h

+ 1 - 1
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];
 

+ 1 - 1
cmd/aes.c

@@ -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>

+ 1 - 1
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
  *

+ 0 - 0
include/aes.h → include/uboot_aes.h


+ 1 - 1
lib/aes.c

@@ -27,7 +27,7 @@
 #else
 #include <string.h>
 #endif
-#include "aes.h"
+#include "uboot_aes.h"
 
 /* forward s-box */
 static const u8 sbox[256] = {

+ 1 - 1
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 */