On Mon, Jun 28, 2021 at 01:11:15AM +0200, Roland Hieber wrote:
> From: Marc Kleine-Budde <[email protected]>
>
> This patch changes cs_get_ca() to only output the CA if it actually
> exists, or print an error and return 1 instead. This makes it possible
> to use make's $(if $(filter-out, ERROR_CA_NOT_YET_SET, ...))
> conditional.
>
> Co-authored-by: Roland Hieber <[email protected]>
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> Signed-off-by: Roland Hieber <[email protected]>
> ---
> PATCH v2 (rhi):
> - reorder from PATCH 3/n to PATCH 1/n
> - echo "ERROR_CA_NOT_YET_SET" in case of error (feedback from Michael
> Olbrich) and also return 1
>
> PATCH v1 (mkl):
> https://lore.ptxdist.org/ptxdist/[email protected]
> ---
> scripts/lib/ptxd_lib_code_signing.sh | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/ptxd_lib_code_signing.sh
> b/scripts/lib/ptxd_lib_code_signing.sh
> index 3e1654bb36e4..0026cdc4dec0 100644
> --- a/scripts/lib/ptxd_lib_code_signing.sh
> +++ b/scripts/lib/ptxd_lib_code_signing.sh
> @@ -243,7 +243,13 @@ cs_get_ca() {
> local role="${1}"
> cs_init_variables
>
> - echo "${keydir}/${role}/ca.pem"
> + local ca="${keydir}/${role}/ca.pem"
> +
> + if [ ! -e "${ca}" ]; then
This is not what I suggested. I think this breaks the use-case described in
the patch description:
An empty string should be returned when the key setup is done but nothing
was added to the CA. I'm quite certain, that the file does not exist in
this case. You need to check for '[ ! -d "${keydir}" ]'.
Michael
> + echo "ERROR_CA_NOT_YET_SET"
> + return 1
> + fi
> + echo "${ca}"
> }
> export -f cs_get_ca
>
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
> To unsubscribe, send a mail with subject "unsubscribe" to
> [email protected]
>
--
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 |
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
