mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
	Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH v4 07/16] keytoc: make key name hint optional
Date: Fri, 27 Sep 2024 10:18:05 +0200	[thread overview]
Message-ID: <92ac4a49-5086-4244-8d0e-d91af72c7ac3@pengutronix.de> (raw)
In-Reply-To: <20240913075924.1652866-8-s.hauer@pengutronix.de>

On 13.09.24 09:59, Sascha Hauer wrote:
> The key name hint is used in barebox to find a key without iterating
> over all keys, but it's not required. Make the key name hint optional
> to keytoc.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>

> ---
>  scripts/keytoc.c | 31 ++++++++++++++++++++++---------
>  1 file changed, 22 insertions(+), 9 deletions(-)
> 
> diff --git a/scripts/keytoc.c b/scripts/keytoc.c
> index ecb33cbe47..85a7cd7319 100644
> --- a/scripts/keytoc.c
> +++ b/scripts/keytoc.c
> @@ -9,6 +9,7 @@
>   *
>   */
>  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
> +#define _GNU_SOURCE
>  #include <stdio.h>
>  #include <string.h>
>  #include <time.h>
> @@ -602,9 +603,9 @@ static int gen_key(const char *keyname, const char *path)
>  
>  int main(int argc, char *argv[])
>  {
> -	char *path, *keyname;
>  	int i, opt, ret;
>  	char *outfile = NULL;
> +	int keynum = 1;
>  
>  	outfilep = stdout;
>  
> @@ -652,21 +653,33 @@ int main(int argc, char *argv[])
>  	}
>  
>  	for (i = optind; i < argc; i++) {
> -		keyname = argv[i];
> +		char *keyspec = argv[i];
> +		char *keyname = NULL;
> +		char *path, *freep = NULL;
>  
> -		path = strchr(keyname, ':');
> -		if (!path) {
> -			fprintf(stderr,
> -				"keys must be given as <key_name_hint>:<crt>\n");
> -			exit(1);
> +		if (!strncmp(keyspec, "pkcs11:", 7)) {
> +			path = keyspec;
> +		} else {
> +			path = strchr(keyspec, ':');
> +			if (path) {
> +				*path = 0;
> +				path++;
> +				keyname = keyspec;
> +			} else {
> +				path = keyspec;
> +			}
>  		}
>  
> -		*path = 0;
> -		path++;
> +		if (!keyname) {
> +			asprintf(&freep, "key_%d", keynum++);
> +			keyname = freep;
> +		}
>  
>  		ret = gen_key(keyname, path);
>  		if (ret)
>  			exit(1);
> +
> +		free(freep);
>  	}
>  
>  	if (dts) {


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



  reply	other threads:[~2024-09-27  8:19 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-13  7:59 [PATCH v4 00/16] Add ECDSA support for FIT image verification Sascha Hauer
2024-09-13  7:59 ` [PATCH v4 01/16] keytoc: remove ECDSA dts support Sascha Hauer
2024-09-25  8:53   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 02/16] keytoc: fail in case gen_key() fails Sascha Hauer
2024-09-25  8:53   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 03/16] keytoc: fix ECDSA endianess problems Sascha Hauer
2024-09-27  8:11   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 04/16] keytoc: remove duplicate __ENV__ check Sascha Hauer
2024-09-27  6:59   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 05/16] crypto: Makefile: make simpler Sascha Hauer
2024-09-27  7:01   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 06/16] crypto/Makefile: Drop unnecessary dependencies Sascha Hauer
2024-09-27  7:03   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 07/16] keytoc: make key name hint optional Sascha Hauer
2024-09-27  8:18   ` Ahmad Fatoum [this message]
2024-09-13  7:59 ` [PATCH v4 08/16] crypto: rsa: include key name hint into CONFIG_CRYPTO_RSA_KEY Sascha Hauer
2024-09-27  7:55   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 09/16] crypto: rsa: encapsulate rsa keys in public keys struct Sascha Hauer
2024-09-27  8:02   ` Ahmad Fatoum
2024-09-27 11:11     ` Sascha Hauer
2024-09-13  7:59 ` [PATCH v4 10/16] crypto: add public_key functions Sascha Hauer
2024-09-27  8:20   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 11/16] crypto: builtin_keys: Allow to specify multiple keys in CONFIG_CRYPTO_PUBLIC_KEYS Sascha Hauer
2024-09-25  8:22   ` Sascha Hauer
2024-09-13  7:59 ` [PATCH v4 12/16] crypto: public-keys: use array of public_keys Sascha Hauer
2024-09-13  7:59 ` [PATCH v4 13/16] crypto: rsa: create static inline wrapper for rsa_verify() Sascha Hauer
2024-09-27  8:09   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 14/16] Add elliptic curve cryptography (ECC) helper functions Sascha Hauer
2024-09-13  7:59 ` [PATCH v4 15/16] crypto: add ECDSA support Sascha Hauer
2024-09-27  8:07   ` Ahmad Fatoum
2024-09-13  7:59 ` [PATCH v4 16/16] crypto: make RSA a visible option Sascha Hauer
2024-09-27 11:23 ` [PATCH v4 00/16] Add ECDSA support for FIT image verification Sascha Hauer
2024-09-27 11:23   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=92ac4a49-5086-4244-8d0e-d91af72c7ac3@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox