From: Stefan Berger <stefanb@linux.ibm.com>
To: jeyu@kernel.org, keyrings@vger.kernel.org, dhowells@redhat.com,
dwmw2@infradead.org, zohar@linux.ibm.com, jarkko@kernel.org
Cc: nayna@linux.ibm.com, linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org,
Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH v6 4/4] certs: Adjustment due to 'Check whether openssl tool is available'
Date: Thu, 10 Jun 2021 08:56:23 -0400 [thread overview]
Message-ID: <20210610125623.1553792-5-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20210610125623.1553792-1-stefanb@linux.ibm.com>
Adjust the previous patch due to fixes applied to the first patch
in the series.
Fixes: 46449892e6e5 ("certs: Add support for using elliptic curve keys for signing modules")
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
certs/Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/certs/Makefile b/certs/Makefile
index dc9f354dd5f8..4eb69bdadc79 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -66,16 +66,21 @@ ifeq ($(CONFIG_MODULE_SIG_KEY),"certs/signing_key.pem")
ifeq ($(openssl_available),yes)
X509TEXT=$(shell openssl x509 -in $(CONFIG_MODULE_SIG_KEY) -text)
+endif
# Support user changing key type
ifdef CONFIG_MODULE_SIG_KEY_TYPE_ECDSA
keytype_openssl = -newkey ec -pkeyopt ec_paramgen_curve:secp384r1
+ifeq ($(openssl_available),yes)
$(if $(findstring id-ecPublicKey,$(X509TEXT)),,$(shell rm -f $(CONFIG_MODULE_SIG_KEY)))
endif
+endif # CONFIG_MODULE_SIG_KEY_TYPE_ECDSA
ifdef CONFIG_MODULE_SIG_KEY_TYPE_RSA
+ifeq ($(openssl_available),yes)
$(if $(findstring rsaEncryption,$(X509TEXT)),,$(shell rm -f $(CONFIG_MODULE_SIG_KEY)))
endif
+endif # CONFIG_MODULE_SIG_KEY_TYPE_RSA
$(obj)/signing_key.pem: $(obj)/x509.genkey
@$(kecho) "###"
--
2.29.2
next prev parent reply other threads:[~2021-06-10 12:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 12:56 [PATCH v6 0/4] Add support for ECDSA-signed kernel modules Stefan Berger
2021-06-10 12:56 ` [PATCH v6 1/4] certs: Trigger creation of RSA module signing key if it's not an RSA key Stefan Berger
2021-06-10 12:56 ` [PATCH v6 2/4] certs: Check whether openssl tool is available Stefan Berger
2021-06-10 12:56 ` [PATCH v6 3/4] certs: Add support for using elliptic curve keys for signing modules Stefan Berger
2021-06-10 12:56 ` Stefan Berger [this message]
2021-06-14 19:23 ` [PATCH v6 4/4] certs: Adjustment due to 'Check whether openssl tool is available' Jarkko Sakkinen
2021-06-14 19:28 ` Stefan Berger
2021-06-15 13:06 ` Jarkko Sakkinen
2021-06-15 13:29 ` Stefan Berger
2021-06-18 9:04 ` Jarkko Sakkinen
2021-06-10 12:59 ` [PATCH v6 0/4] Add support for ECDSA-signed kernel modules Stefan Berger
2021-06-14 19:19 ` Jarkko Sakkinen
2021-06-14 19:20 ` Stefan Berger
2021-06-15 13:05 ` Jarkko Sakkinen
2021-06-14 19:21 ` Jarkko Sakkinen
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=20210610125623.1553792-5-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=jarkko@kernel.org \
--cc=jeyu@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=nayna@linux.ibm.com \
--cc=zohar@linux.ibm.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.