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>

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 · Tom Rini
1 parent 40a808f173
Showing 7 changed files with 99 additions and 99 deletions Side-by-side Diff
arch/arm/mach-tegra/tegra20/crypto.c
cmd/aes.c
common/env_common.c
include/aes.h
include/uboot_aes.h
lib/aes.c
tools/env/fw_env.h
@@ -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>
@@ -140,7 +140,7 @@
 }
  
 #ifdef CONFIG_ENV_AES
-#include <aes.h>
+#include <uboot_aes.h>
 /**
  * env_aes_cbc_get_key() - Get AES-128-CBC key for the environment
  *
-/*
- * Copyright (c) 2011 The Chromium OS Authors.
- * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef _AES_REF_H_
-#define _AES_REF_H_
-
-#ifdef USE_HOSTCC
-/* Define compat stuff for use in fw_* tools. */
-typedef unsigned char u8;
-typedef unsigned int u32;
-#define debug(...) do {} while (0)
-#endif
-
-/*
- * AES encryption library, with small code size, supporting only 128-bit AES
- *
- * AES is a stream cipher which works a block at a time, with each block
- * in this case being AES_KEY_LENGTH bytes.
- */
-
-enum {
-	AES_STATECOLS	= 4,	/* columns in the state & expanded key */
-	AES_KEYCOLS	= 4,	/* columns in a key */
-	AES_ROUNDS	= 10,	/* rounds in encryption */
-
-	AES_KEY_LENGTH	= 128 / 8,
-	AES_EXPAND_KEY_LENGTH	= 4 * AES_STATECOLS * (AES_ROUNDS + 1),
-};
-
-/**
- * aes_expand_key() - Expand the AES key
- *
- * Expand a key into a key schedule, which is then used for the other
- * operations.
- *
- * @key		Key, of length AES_KEY_LENGTH bytes
- * @expkey	Buffer to place expanded key, AES_EXPAND_KEY_LENGTH
- */
-void aes_expand_key(u8 *key, u8 *expkey);
-
-/**
- * aes_encrypt() - Encrypt single block of data with AES 128
- *
- * @in		Input data
- * @expkey	Expanded key to use for encryption (from aes_expand_key())
- * @out		Output data
- */
-void aes_encrypt(u8 *in, u8 *expkey, u8 *out);
-
-/**
- * aes_decrypt() - Decrypt single block of data with AES 128
- *
- * @in		Input data
- * @expkey	Expanded key to use for decryption (from aes_expand_key())
- * @out		Output data
- */
-void aes_decrypt(u8 *in, u8 *expkey, u8 *out);
-
-/**
- * Apply chain data to the destination using EOR
- *
- * Each array is of length AES_KEY_LENGTH.
- *
- * @cbc_chain_data	Chain data
- * @src			Source data
- * @dst			Destination data, which is modified here
- */
-void aes_apply_cbc_chain_data(u8 *cbc_chain_data, u8 *src, u8 *dst);
-
-/**
- * aes_cbc_encrypt_blocks() - Encrypt multiple blocks of data with AES CBC.
- *
- * @key_exp		Expanded key to use
- * @src			Source data to encrypt
- * @dst			Destination buffer
- * @num_aes_blocks	Number of AES blocks to encrypt
- */
-void aes_cbc_encrypt_blocks(u8 *key_exp, u8 *src, u8 *dst, u32 num_aes_blocks);
-
-/**
- * Decrypt multiple blocks of data with AES CBC.
- *
- * @key_exp		Expanded key to use
- * @src			Source data to decrypt
- * @dst			Destination buffer
- * @num_aes_blocks	Number of AES blocks to decrypt
- */
-void aes_cbc_decrypt_blocks(u8 *key_exp, u8 *src, u8 *dst, u32 num_aes_blocks);
-
-#endif /* _AES_REF_H_ */
+/*
+ * Copyright (c) 2011 The Chromium OS Authors.
+ * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _AES_REF_H_
+#define _AES_REF_H_
+
+#ifdef USE_HOSTCC
+/* Define compat stuff for use in fw_* tools. */
+typedef unsigned char u8;
+typedef unsigned int u32;
+#define debug(...) do {} while (0)
+#endif
+
+/*
+ * AES encryption library, with small code size, supporting only 128-bit AES
+ *
+ * AES is a stream cipher which works a block at a time, with each block
+ * in this case being AES_KEY_LENGTH bytes.
+ */
+
+enum {
+	AES_STATECOLS	= 4,	/* columns in the state & expanded key */
+	AES_KEYCOLS	= 4,	/* columns in a key */
+	AES_ROUNDS	= 10,	/* rounds in encryption */
+
+	AES_KEY_LENGTH	= 128 / 8,
+	AES_EXPAND_KEY_LENGTH	= 4 * AES_STATECOLS * (AES_ROUNDS + 1),
+};
+
+/**
+ * aes_expand_key() - Expand the AES key
+ *
+ * Expand a key into a key schedule, which is then used for the other
+ * operations.
+ *
+ * @key		Key, of length AES_KEY_LENGTH bytes
+ * @expkey	Buffer to place expanded key, AES_EXPAND_KEY_LENGTH
+ */
+void aes_expand_key(u8 *key, u8 *expkey);
+
+/**
+ * aes_encrypt() - Encrypt single block of data with AES 128
+ *
+ * @in		Input data
+ * @expkey	Expanded key to use for encryption (from aes_expand_key())
+ * @out		Output data
+ */
+void aes_encrypt(u8 *in, u8 *expkey, u8 *out);
+
+/**
+ * aes_decrypt() - Decrypt single block of data with AES 128
+ *
+ * @in		Input data
+ * @expkey	Expanded key to use for decryption (from aes_expand_key())
+ * @out		Output data
+ */
+void aes_decrypt(u8 *in, u8 *expkey, u8 *out);
+
+/**
+ * Apply chain data to the destination using EOR
+ *
+ * Each array is of length AES_KEY_LENGTH.
+ *
+ * @cbc_chain_data	Chain data
+ * @src			Source data
+ * @dst			Destination data, which is modified here
+ */
+void aes_apply_cbc_chain_data(u8 *cbc_chain_data, u8 *src, u8 *dst);
+
+/**
+ * aes_cbc_encrypt_blocks() - Encrypt multiple blocks of data with AES CBC.
+ *
+ * @key_exp		Expanded key to use
+ * @src			Source data to encrypt
+ * @dst			Destination buffer
+ * @num_aes_blocks	Number of AES blocks to encrypt
+ */
+void aes_cbc_encrypt_blocks(u8 *key_exp, u8 *src, u8 *dst, u32 num_aes_blocks);
+
+/**
+ * Decrypt multiple blocks of data with AES CBC.
+ *
+ * @key_exp		Expanded key to use
+ * @src			Source data to decrypt
+ * @dst			Destination buffer
+ * @num_aes_blocks	Number of AES blocks to decrypt
+ */
+void aes_cbc_decrypt_blocks(u8 *key_exp, u8 *src, u8 *dst, u32 num_aes_blocks);
+
+#endif /* _AES_REF_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] = {
@@ -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 */
...	...	@@ -8,7 +8,7 @@
8	8	#include <common.h>
9	9	#include <linux/errno.h>
10	10	#include "crypto.h"
11		-#include "aes.h"
	11	+#include "uboot_aes.h"
12	12
13	13	static u8 zero_key[16];
14	14
...	...	@@ -9,7 +9,7 @@
9	9	#include <common.h>
10	10	#include <command.h>
11	11	#include <environment.h>
12		-#include <aes.h>
	12	+#include <uboot_aes.h>
13	13	#include <malloc.h>
14	14	#include <asm/byteorder.h>
15	15	#include <linux/compiler.h>
...	...	@@ -140,7 +140,7 @@
140	140	}
141	141
142	142	#ifdef CONFIG_ENV_AES
143		-#include <aes.h>
	143	+#include <uboot_aes.h>
144	144	/**
145	145	* env_aes_cbc_get_key() - Get AES-128-CBC key for the environment
146	146	*
1		-/*
2		- * Copyright (c) 2011 The Chromium OS Authors.
3		- * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
4		- *
5		- * SPDX-License-Identifier: GPL-2.0+
6		- */
7		-
8		-#ifndef _AES_REF_H_
9		-#define _AES_REF_H_
10		-
11		-#ifdef USE_HOSTCC
12		-/* Define compat stuff for use in fw_* tools. */
13		-typedef unsigned char u8;
14		-typedef unsigned int u32;
15		-#define debug(...) do {} while (0)
16		-#endif
17		-
18		-/*
19		- * AES encryption library, with small code size, supporting only 128-bit AES
20		- *
21		- * AES is a stream cipher which works a block at a time, with each block
22		- * in this case being AES_KEY_LENGTH bytes.
23		- */
24		-
25		-enum {
26		- AES_STATECOLS = 4, /* columns in the state & expanded key */
27		- AES_KEYCOLS = 4, /* columns in a key */
28		- AES_ROUNDS = 10, /* rounds in encryption */
29		-
30		- AES_KEY_LENGTH = 128 / 8,
31		- AES_EXPAND_KEY_LENGTH = 4 * AES_STATECOLS * (AES_ROUNDS + 1),
32		-};
33		-
34		-/**
35		- * aes_expand_key() - Expand the AES key
36		- *
37		- * Expand a key into a key schedule, which is then used for the other
38		- * operations.
39		- *
40		- * @key Key, of length AES_KEY_LENGTH bytes
41		- * @expkey Buffer to place expanded key, AES_EXPAND_KEY_LENGTH
42		- */
43		-void aes_expand_key(u8 key, u8 expkey);
44		-
45		-/**
46		- * aes_encrypt() - Encrypt single block of data with AES 128
47		- *
48		- * @in Input data
49		- * @expkey Expanded key to use for encryption (from aes_expand_key())
50		- * @out Output data
51		- */
52		-void aes_encrypt(u8 in, u8 expkey, u8 *out);
53		-
54		-/**
55		- * aes_decrypt() - Decrypt single block of data with AES 128
56		- *
57		- * @in Input data
58		- * @expkey Expanded key to use for decryption (from aes_expand_key())
59		- * @out Output data
60		- */
61		-void aes_decrypt(u8 in, u8 expkey, u8 *out);
62		-
63		-/**
64		- * Apply chain data to the destination using EOR
65		- *
66		- * Each array is of length AES_KEY_LENGTH.
67		- *
68		- * @cbc_chain_data Chain data
69		- * @src Source data
70		- * @dst Destination data, which is modified here
71		- */
72		-void aes_apply_cbc_chain_data(u8 cbc_chain_data, u8 src, u8 *dst);
73		-
74		-/**
75		- * aes_cbc_encrypt_blocks() - Encrypt multiple blocks of data with AES CBC.
76		- *
77		- * @key_exp Expanded key to use
78		- * @src Source data to encrypt
79		- * @dst Destination buffer
80		- * @num_aes_blocks Number of AES blocks to encrypt
81		- */
82		-void aes_cbc_encrypt_blocks(u8 key_exp, u8 src, u8 *dst, u32 num_aes_blocks);
83		-
84		-/**
85		- * Decrypt multiple blocks of data with AES CBC.
86		- *
87		- * @key_exp Expanded key to use
88		- * @src Source data to decrypt
89		- * @dst Destination buffer
90		- * @num_aes_blocks Number of AES blocks to decrypt
91		- */
92		-void aes_cbc_decrypt_blocks(u8 key_exp, u8 src, u8 *dst, u32 num_aes_blocks);
93		-
94		-#endif /* _AES_REF_H_ */
	1	+/*
	2	+ * Copyright (c) 2011 The Chromium OS Authors.
	3	+ * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
	4	+ *
	5	+ * SPDX-License-Identifier: GPL-2.0+
	6	+ */
	7	+
	8	+#ifndef _AES_REF_H_
	9	+#define _AES_REF_H_
	10	+
	11	+#ifdef USE_HOSTCC
	12	+/* Define compat stuff for use in fw_* tools. */
	13	+typedef unsigned char u8;
	14	+typedef unsigned int u32;
	15	+#define debug(...) do {} while (0)
	16	+#endif
	17	+
	18	+/*
	19	+ * AES encryption library, with small code size, supporting only 128-bit AES
	20	+ *
	21	+ * AES is a stream cipher which works a block at a time, with each block
	22	+ * in this case being AES_KEY_LENGTH bytes.
	23	+ */
	24	+
	25	+enum {
	26	+ AES_STATECOLS = 4, /* columns in the state & expanded key */
	27	+ AES_KEYCOLS = 4, /* columns in a key */
	28	+ AES_ROUNDS = 10, /* rounds in encryption */
	29	+
	30	+ AES_KEY_LENGTH = 128 / 8,
	31	+ AES_EXPAND_KEY_LENGTH = 4 * AES_STATECOLS * (AES_ROUNDS + 1),
	32	+};
	33	+
	34	+/**
	35	+ * aes_expand_key() - Expand the AES key
	36	+ *
	37	+ * Expand a key into a key schedule, which is then used for the other
	38	+ * operations.
	39	+ *
	40	+ * @key Key, of length AES_KEY_LENGTH bytes
	41	+ * @expkey Buffer to place expanded key, AES_EXPAND_KEY_LENGTH
	42	+ */
	43	+void aes_expand_key(u8 key, u8 expkey);
	44	+
	45	+/**
	46	+ * aes_encrypt() - Encrypt single block of data with AES 128
	47	+ *
	48	+ * @in Input data
	49	+ * @expkey Expanded key to use for encryption (from aes_expand_key())
	50	+ * @out Output data
	51	+ */
	52	+void aes_encrypt(u8 in, u8 expkey, u8 *out);
	53	+
	54	+/**
	55	+ * aes_decrypt() - Decrypt single block of data with AES 128
	56	+ *
	57	+ * @in Input data
	58	+ * @expkey Expanded key to use for decryption (from aes_expand_key())
	59	+ * @out Output data
	60	+ */
	61	+void aes_decrypt(u8 in, u8 expkey, u8 *out);
	62	+
	63	+/**
	64	+ * Apply chain data to the destination using EOR
	65	+ *
	66	+ * Each array is of length AES_KEY_LENGTH.
	67	+ *
	68	+ * @cbc_chain_data Chain data
	69	+ * @src Source data
	70	+ * @dst Destination data, which is modified here
	71	+ */
	72	+void aes_apply_cbc_chain_data(u8 cbc_chain_data, u8 src, u8 *dst);
	73	+
	74	+/**
	75	+ * aes_cbc_encrypt_blocks() - Encrypt multiple blocks of data with AES CBC.
	76	+ *
	77	+ * @key_exp Expanded key to use
	78	+ * @src Source data to encrypt
	79	+ * @dst Destination buffer
	80	+ * @num_aes_blocks Number of AES blocks to encrypt
	81	+ */
	82	+void aes_cbc_encrypt_blocks(u8 key_exp, u8 src, u8 *dst, u32 num_aes_blocks);
	83	+
	84	+/**
	85	+ * Decrypt multiple blocks of data with AES CBC.
	86	+ *
	87	+ * @key_exp Expanded key to use
	88	+ * @src Source data to decrypt
	89	+ * @dst Destination buffer
	90	+ * @num_aes_blocks Number of AES blocks to decrypt
	91	+ */
	92	+void aes_cbc_decrypt_blocks(u8 key_exp, u8 src, u8 *dst, u32 num_aes_blocks);
	93	+
	94	+#endif /* _AES_REF_H_ */
...	...	@@ -27,7 +27,7 @@
27	27	#else
28	28	#include <string.h>
29	29	#endif
30		-#include "aes.h"
	30	+#include "uboot_aes.h"
31	31
32	32	/* forward s-box */
33	33	static const u8 sbox[256] = {
...	...	@@ -5,7 +5,7 @@
5	5	* SPDX-License-Identifier: GPL-2.0+
6	6	*/
7	7
8		-#include <aes.h>
	8	+#include <uboot_aes.h>
9	9	#include <stdint.h>
10	10
11	11	/* Pull in the current config to define the default environment */