From: Roland Hieber <rhi@pengutronix.de> To: ptxdist@pengutronix.de Cc: Marc Kleine-Budde <mkl@pengutronix.de>, Roland Hieber <rhi@pengutronix.de> Subject: [ptxdist] [PATCH v4] ptxd_lib_code_signing: cs_get_ca(): improve error handling Date: Tue, 13 Jul 2021 13:51:25 +0200 [thread overview] Message-ID: <20210713115125.15630-1-rhi@pengutronix.de> (raw) In-Reply-To: <20210712084247.zvazdqqsffzjotwt@pengutronix.de> From: Marc Kleine-Budde <mkl@pengutronix.de> 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 <rhi@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- PATCH v4: - revert to [ -e "${ca}" ] test (feeback from Michael Olbrich and Marc Kleine-Budde) - add documentation too PATCH v3: https://lore.ptxdist.org/ptxdist/20210708203941.30212-1-rhi@pengutronix.de - correctly check for existence of ${keydir} instead of ${ca} (feedback from Michael Olbrich) - drop controversial re-indentation patches 6/7 and 7/7 from the series PATCH v2 (rhi): https://lore.ptxdist.org/ptxdist/20210627231121.28313-1-rhi@pengutronix.de - 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/20210412161900.2376802-3-mkl@pengutronix.de fixup! ptxd_lib_code_signing: cs_get_ca(): improve error handling --- doc/ref_code_signing_helpers.rst | 3 ++- scripts/lib/ptxd_lib_code_signing.sh | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/ref_code_signing_helpers.rst b/doc/ref_code_signing_helpers.rst index 99a395b287c9..0fd61219a97a 100644 --- a/doc/ref_code_signing_helpers.rst +++ b/doc/ref_code_signing_helpers.rst @@ -334,4 +334,5 @@ Preconditions: - a certificate must have been appended to the CA keyring (see :ref:`cs_append_ca_from_pem`, :ref:`cs_append_ca_from_der`, - :ref:`cs_append_ca_from_uri`) + :ref:`cs_append_ca_from_uri`). + Otherwise, this function will print ``ERROR_CA_NOT_YET_SET``. diff --git a/scripts/lib/ptxd_lib_code_signing.sh b/scripts/lib/ptxd_lib_code_signing.sh index 5fa62d8372f9..ca101d635574 100644 --- a/scripts/lib/ptxd_lib_code_signing.sh +++ b/scripts/lib/ptxd_lib_code_signing.sh @@ -288,7 +288,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 + echo "ERROR_CA_NOT_YET_SET" + return 1 + fi + echo "${ca}" } export -f cs_get_ca -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-07-13 11:52 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-08 20:39 [ptxdist] [PATCH v3 1/5] " Roland Hieber 2021-07-08 20:39 ` [ptxdist] [PATCH v3 2/5] ptxd_lib_code_signing: introduce role groups Roland Hieber 2021-07-20 11:48 ` [ptxdist] [APPLIED] " Michael Olbrich 2021-07-08 20:39 ` [ptxdist] [PATCH v3 3/5] templates/code-signing-provider: set up the 'imx-habv4-srk' role group Roland Hieber 2021-07-20 11:48 ` [ptxdist] [APPLIED] " Michael Olbrich 2021-07-08 20:39 ` [ptxdist] [PATCH v3 4/5] templates/barebox-imx-habv4: use " Roland Hieber 2021-07-20 11:48 ` [ptxdist] [APPLIED] " Michael Olbrich 2021-07-08 20:39 ` [ptxdist] [PATCH v3 5/5] host-ptx-code-signing-dev: version bump 0.4 -> 0.5 Roland Hieber 2021-07-20 11:48 ` [ptxdist] [APPLIED] " Michael Olbrich 2021-07-09 13:36 ` [ptxdist] [PATCH v3 1/5] ptxd_lib_code_signing: cs_get_ca(): improve error handling Michael Olbrich 2021-07-12 8:42 ` Marc Kleine-Budde 2021-07-13 11:51 ` Roland Hieber [this message] 2021-07-14 6:21 ` [ptxdist] [PATCH v4] " Michael Olbrich 2021-07-15 13:42 ` [ptxdist] [PATCH v5] " Roland Hieber 2021-07-20 11:49 ` [ptxdist] [APPLIED] " Michael Olbrich
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=20210713115125.15630-1-rhi@pengutronix.de \ --to=rhi@pengutronix.de \ --cc=mkl@pengutronix.de \ --cc=ptxdist@pengutronix.de \ --subject='Re: [ptxdist] [PATCH v4] ptxd_lib_code_signing: cs_get_ca(): improve error handling' \ /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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox