summaryrefslogtreecommitdiffstats
path: root/certs
diff options
context:
space:
mode:
authorStefan Berger <stefanb@linux.ibm.com>2021-06-29 17:34:20 -0400
committerJarkko Sakkinen <jarkko@kernel.org>2021-08-23 19:55:42 +0300
commitea35e0d5df6c92fa2e124bb1b91d09b2240715ba (patch)
tree577cb6fbea38ddc7cb7e35f90de4428296abc273 /certs
parent6824f8554a98cba516c3bfd5f9064d7ba0501644 (diff)
downloadlinux-ea35e0d5df6c92fa2e124bb1b91d09b2240715ba.tar.gz
linux-ea35e0d5df6c92fa2e124bb1b91d09b2240715ba.tar.bz2
linux-ea35e0d5df6c92fa2e124bb1b91d09b2240715ba.zip
certs: Trigger creation of RSA module signing key if it's not an RSA key
Address a kbuild issue where a developer created an ECDSA key for signing kernel modules and then builds an older version of the kernel, when bi- secting the kernel for example, that does not support ECDSA keys. If openssl is installed, trigger the creation of an RSA module signing key if it is not an RSA key. Fixes: cfc411e7fff3 ("Move certificate handling to its own directory") Cc: David Howells <dhowells@redhat.com> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Tested-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Diffstat (limited to 'certs')
-rw-r--r--certs/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/certs/Makefile b/certs/Makefile
index 359239a0ee9e..f9344e52ecda 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -57,11 +57,19 @@ endif
redirect_openssl = 2>&1
quiet_redirect_openssl = 2>&1
silent_redirect_openssl = 2>/dev/null
+openssl_available = $(shell openssl help 2>/dev/null && echo yes)
# We do it this way rather than having a boolean option for enabling an
# external private key, because 'make randconfig' might enable such a
# boolean option and we unfortunately can't make it depend on !RANDCONFIG.
ifeq ($(CONFIG_MODULE_SIG_KEY),"certs/signing_key.pem")
+
+ifeq ($(openssl_available),yes)
+X509TEXT=$(shell openssl x509 -in "certs/signing_key.pem" -text 2>/dev/null)
+
+$(if $(findstring rsaEncryption,$(X509TEXT)),,$(shell rm -f "certs/signing_key.pem"))
+endif
+
$(obj)/signing_key.pem: $(obj)/x509.genkey
@$(kecho) "###"
@$(kecho) "### Now generating an X.509 key pair to be used for signing modules."