Re: [PATCH] mkimage: ecdsa: password for signing from environment

2023-06-21 Thread Tom Rini
On Thu, May 25, 2023 at 10:18:05AM +0200, Stefano Babic wrote:

> Use a variable (MKIMAGE_SIGN_PASSWORD) like already done for RSA to
> allow the signing process to run in batch.
> 
> Signed-off-by: Stefano Babic 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature


[PATCH] mkimage: ecdsa: password for signing from environment

2023-05-25 Thread Stefano Babic
Use a variable (MKIMAGE_SIGN_PASSWORD) like already done for RSA to
allow the signing process to run in batch.

Signed-off-by: Stefano Babic 
---
 lib/ecdsa/ecdsa-libcrypto.c | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/ecdsa/ecdsa-libcrypto.c b/lib/ecdsa/ecdsa-libcrypto.c
index d5939af2c5..5fa9be10b4 100644
--- a/lib/ecdsa/ecdsa-libcrypto.c
+++ b/lib/ecdsa/ecdsa-libcrypto.c
@@ -111,16 +111,30 @@ static size_t ecdsa_key_size_bytes(const EC_KEY *key)
return EC_GROUP_order_bits(group) / 8;
 }
 
+static int default_password(char *buf, int size, int rwflag, void *u)
+{
+   strncpy(buf, (char *)u, size);
+   buf[size - 1] = '\0';
+   return strlen(buf);
+}
+
 static int read_key(struct signer *ctx, const char *key_name)
 {
FILE *f = fopen(key_name, "r");
+   const char *key_pass;
 
if (!f) {
fprintf(stderr, "Can not get key file '%s'\n", key_name);
return -ENOENT;
}
 
-   ctx->evp_key = PEM_read_PrivateKey(f, NULL, NULL, NULL);
+   key_pass = getenv("MKIMAGE_SIGN_PASSWORD");
+   if (key_pass) {
+   ctx->evp_key = PEM_read_PrivateKey(f, NULL, default_password, 
(void *)key_pass);
+
+   } else {
+   ctx->evp_key = PEM_read_PrivateKey(f, NULL, NULL, NULL);
+   }
fclose(f);
if (!ctx->evp_key) {
fprintf(stderr, "Can not read key from '%s'\n", key_name);
-- 
2.34.1