Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: fix encrypted env support when using ubootenv 

The caam encryption check was only done from fw_env_write and fw_env_read
functions, which are not called when using the functions exported as a library.

Move the check_caam_encryption() call to fw_env_open(), which is called from
all code paths. A similar check for AES encryption cannot be moved because it
requires the AES key as an argument.

https://jira.digi.com/browse/DEL-3616

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
This commit is contained in:
Diaz de Grenu, Jose 2017-02-01 13:51:22 +01:00
parent e0bc435685
commit 6a431c5363
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-implement-support-for-environment-encrypti.patch
View File

@ -1,7 +1,7 @@
From: "Diaz de Grenu, Jose" <Jose.DiazdeGrenu@digi.com> From: "Diaz de Grenu, Jose" <Jose.DiazdeGrenu@digi.com>
Date: Tue, 23 Aug 2016 13:05:05 +0200 Date: Tue, 23 Aug 2016 13:05:05 +0200
Subject: [PATCH] tools: env: implement support for environment encryption by Subject: [PATCH] tools: env: implement support for environment encryption
CAAM by CAAM
https://jira.digi.com/browse/DEL-2836 https://jira.digi.com/browse/DEL-2836
@ -10,8 +10,8 @@ Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
configs/sandbox_defconfig | 1 + configs/sandbox_defconfig | 1 +
tools/env/Makefile | 2 +- tools/env/Makefile | 2 +-
tools/env/caam_keyblob.h | 45 +++++++++++++++ tools/env/caam_keyblob.h | 45 +++++++++++++++
tools/env/fw_env.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++ tools/env/fw_env.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 187 insertions(+), 1 deletion(-) 4 files changed, 185 insertions(+), 1 deletion(-)
create mode 100644 tools/env/caam_keyblob.h create mode 100644 tools/env/caam_keyblob.h
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
@ -89,7 +89,7 @@ index 000000000000..1e33b3f01a05
+#endif /* CAAM_KEYBLOB_H */ +#endif /* CAAM_KEYBLOB_H */
\ No newline at end of file \ No newline at end of file
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index daa02a760e37..09f06c874b17 100644 index daa02a760e37..806c2fb6d550 100644
--- a/tools/env/fw_env.c --- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c +++ b/tools/env/fw_env.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -233,16 +233,7 @@ index daa02a760e37..09f06c874b17 100644
/* /*
* Print the current definition of one, or more, or all * Print the current definition of one, or more, or all
* environment variables * environment variables
@@ -259,6 +368,8 @@ int fw_printenv (int argc, char *argv[]) @@ -334,6 +443,15 @@ int fw_env_close(void)
argc -= 2;
}
+ check_caam_encryption();
+
if (fw_env_open())
return -1;
@@ -334,6 +445,15 @@ int fw_env_close(void)
} }
} }
@ -258,16 +249,16 @@ index daa02a760e37..09f06c874b17 100644
/* /*
* Update CRC * Update CRC
*/ */
@@ -504,6 +624,8 @@ int fw_setenv(int argc, char *argv[]) @@ -1191,6 +1309,8 @@ int fw_env_open(void)
argc -= 2; struct env_image_single *single;
} struct env_image_redundant *redundant;
+ check_caam_encryption(); + check_caam_encryption();
+ +
if (argc < 2) { if (parse_config ()) /* should fill envdevices */
errno = EINVAL;
return -1; return -1;
@@ -1229,6 +1351,15 @@ int fw_env_open(void)
@@ -1229,6 +1349,15 @@ int fw_env_open(void)
return ret; return ret;
} }
@ -283,7 +274,7 @@ index daa02a760e37..09f06c874b17 100644
crc0_ok = (crc0 == *environment.crc); crc0_ok = (crc0 == *environment.crc);
if (!HaveRedundEnv) { if (!HaveRedundEnv) {
if (!crc0_ok) { if (!crc0_ok) {
@@ -1286,6 +1417,15 @@ int fw_env_open(void) @@ -1286,6 +1415,15 @@ int fw_env_open(void)
return ret; return ret;
} }