aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-envtools/patches/200-fw_env_no_aes.patch
diff options
context:
space:
mode:
authorLuis Araneda <luaraneda@gmail.com>2018-04-06 11:23:34 -0300
committerHauke Mehrtens <hauke@hauke-m.de>2018-04-18 23:59:32 +0200
commit68150d3125447a40cf103aeefd9bcb6c874e6769 (patch)
treee2c78ddaccb31c4da0dc874a0d412f5332b63233 /package/boot/uboot-envtools/patches/200-fw_env_no_aes.patch
parent7b758f7f4faceaea6b2d484658dfecd0e3ea3e23 (diff)
downloadupstream-68150d3125447a40cf103aeefd9bcb6c874e6769.tar.gz
upstream-68150d3125447a40cf103aeefd9bcb6c874e6769.tar.bz2
upstream-68150d3125447a40cf103aeefd9bcb6c874e6769.zip
uboot-envtools: update to 2018.03
Several changes has been made: + AES support has been removed by upstream commit c6831c7 (2017-11-14) [remove patch "200-fw_env_no_aes.patch"] + Support for UBI volumes has beed added by upstream commit 34255b9 (2017-11-15) [remove patch "300-support-env-in-ubivol-chardev.patch"] + A command line argument has beed added ("-c") to manually indicate the location of the environment configuration file Also, patch "400-u-boot-2015.10-stdint.patch" is no longer necessary, and the config option to enable UBI support has been removed. Size comparisons: fw_printenv size: Target Before After ar71xx 15,189 bytes 18,133 bytes (+2,944 bytes) ipq40xx 20,873 bytes 20,987 bytes (+114 bytes) mvebu 20,881 bytes 20,991 bytes (+110 bytes) ramips 15,128 bytes 18,072 bytes (+2,944 bytes) OPKG package size: Target Before After ar71xx 11,309 bytes 12,875 bytes (+1,566 bytes) ipq40xx 11,772 bytes 13,299 bytes (+1,527 bytes) mvebu 11,609 bytes 13,114 bytes (+1,505 bytes) ramips 10,975 bytes 12,503 bytes (+1,528 bytes) Compile tested: ipq40xx (musl, glibc, gcc5-musl), ar71xx, mvebu, ramips Run tested: ipq40xx (ASUS RT-AC58U) Signed-off-by: Luis Araneda <luaraneda@gmail.com>
Diffstat (limited to 'package/boot/uboot-envtools/patches/200-fw_env_no_aes.patch')
-rw-r--r--package/boot/uboot-envtools/patches/200-fw_env_no_aes.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/package/boot/uboot-envtools/patches/200-fw_env_no_aes.patch b/package/boot/uboot-envtools/patches/200-fw_env_no_aes.patch
deleted file mode 100644
index 9c8681ff48..0000000000
--- a/package/boot/uboot-envtools/patches/200-fw_env_no_aes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/tools/env/fw_env.c
-+++ b/tools/env/fw_env.c
-@@ -246,7 +246,7 @@ int fw_printenv (int argc, char *argv[])
- int i, n_flag;
- int rc = 0;
-
-- if (argc >= 2 && strcmp(argv[1], "-a") == 0) {
-+ if (0 && argc >= 2 && strcmp(argv[1], "-a") == 0) {
- if (argc < 3) {
- fprintf(stderr,
- "## Error: '-a' option requires AES key\n");
-@@ -325,7 +325,7 @@ int fw_printenv (int argc, char *argv[])
- int fw_env_close(void)
- {
- int ret;
-- if (aes_flag) {
-+ if (0 && aes_flag) {
- ret = env_aes_cbc_crypt(environment.data, 1);
- if (ret) {
- fprintf(stderr,
-@@ -1223,7 +1223,7 @@ int fw_env_open(void)
-
- crc0 = crc32 (0, (uint8_t *) environment.data, ENV_SIZE);
-
-- if (aes_flag) {
-+ if (0 && aes_flag) {
- ret = env_aes_cbc_crypt(environment.data, 0);
- if (ret)
- return ret;
-@@ -1280,7 +1280,7 @@ int fw_env_open(void)
-
- crc1 = crc32 (0, (uint8_t *) redundant->data, ENV_SIZE);
-
-- if (aes_flag) {
-+ if (0 && aes_flag) {
- ret = env_aes_cbc_crypt(redundant->data, 0);
- if (ret)
- return ret;