From 8b27abd8ab1f9d04b8eb93a1759ff8dec7c9d576 Mon Sep 17 00:00:00 2001
From: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
Date: Wed, 9 Dec 2015 13:13:22 +0100
Subject: [PATCH] tools: env: make parse_aes_key stateless
Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
---
tools/env/fw_env.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 8c452a8693..7f851e1647 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -208,7 +208,7 @@ char *fw_getdefenv(char *name)
return NULL;
}
-static int parse_aes_key(char *key)
+static int parse_aes_key(char *key, uint8_t *bin_key)
{
char tmp[5] = { '0', 'x', 0, 0, 0 };
unsigned long ul;
@@ -230,11 +230,9 @@ static int parse_aes_key(char *key)
"## Error: '-a' option requires valid AES key\n");
return -1;
}
- aes_key[i] = ul & 0xff;
+ bin_key[i] = ul & 0xff;
key += 2;
}
- aes_flag = 1;
-
return 0;
}
@@ -267,9 +265,10 @@ int fw_printenv (int argc, char *argv[])
"## Error: '-a' option requires AES key\n");
return -1;
}
- rc = parse_aes_key(argv[2]);
+ rc = parse_aes_key(argv[2], aes_key);
if (rc)
return rc;
+ aes_flag = 1;
argv += 2;
argc -= 2;
}
@@ -526,9 +525,10 @@ int fw_setenv(int argc, char *argv[])
"## Error: '-a' option requires AES key\n");
return -1;
}
- rc = parse_aes_key(argv[2]);
+ rc = parse_aes_key(argv[2], aes_key);
if (rc)
return rc;
+ aes_flag = 1;
argv += 2;
argc -= 2;
}
--
2.39.5