summaryrefslogtreecommitdiff
path: root/include/environment.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-11-14 08:39:35 -0500
committerTom Rini <trini@konsulko.com>2017-11-21 07:43:31 -0500
commitc6831c74a9e9dbedc351de94d23d35188ae1a39b (patch)
treeec3444def18bc20f81dce3594b01dfdba9097949 /include/environment.h
parent042de609ed49cfc41afb13639850c7b01079a527 (diff)
env: Remove CONFIG_ENV_AES support
This support has been deprecated since v2017.09 due to security issues. We now remove this support. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/environment.h')
-rw-r--r--include/environment.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/include/environment.h b/include/environment.h
index 7b98216389..d29f82cb5d 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -143,12 +143,7 @@ extern unsigned long nand_env_oob_offset;
# define ENV_HEADER_SIZE (sizeof(uint32_t))
#endif
-#ifdef CONFIG_ENV_AES
-/* Make sure the payload is multiple of AES block size */
-#define ENV_SIZE ((CONFIG_ENV_SIZE - ENV_HEADER_SIZE) & ~(16 - 1))
-#else
#define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)
-#endif
typedef struct environment_s {
uint32_t crc; /* CRC32 over data bytes */
@@ -156,12 +151,7 @@ typedef struct environment_s {
unsigned char flags; /* active/obsolete flags */
#endif
unsigned char data[ENV_SIZE]; /* Environment data */
-} env_t
-#ifdef CONFIG_ENV_AES
-/* Make sure the env is aligned to block size. */
-__attribute__((aligned(16)))
-#endif
-;
+} env_t;
#ifdef ENV_IS_EMBEDDED
extern env_t environment;