This series adds support for ECDSA-signed kernel modules. It also
attempts to 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 bisecting the kernel for example, that does not support
ECDSA keys.
The first patch addresses the kbuild issue of needing to delete that
ECDSA key if it is in certs/signing_key.pem and trigger the creation
of an RSA key. However, for this to work this patch would have to be
backported to previous versions of the kernel but would also only work
for the developer if he/she used a stable version of the kernel to which
this patch was applied. So whether this patch actually achieves the
wanted effect is not always guaranteed.
The 2nd patch adds the support for the ECSDA-signed kernel modules.
This patch depends on the ECDSA support series currently queued here:
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/log/?h=ecc
Stefan
v6:
- Patch 2/4 is fixing V4's 1/2 and 4/4 is fixing V4's 2/2. Both fixup
patches to be squashed.
v5:
- do not touch the key files if openssl is not installed; likely
addresses an issue pointed out by kernel test robot
v4:
- extending 'depends on' with MODULES to (IMA_APPRAISE_MODSIG && MODULES)
v3:
- added missing OIDs for ECDSA signed hashes to pkcs7_sig_note_pkey_algo
- added recommendation to use string hash to Kconfig help text
v2:
- Adjustment to ECDSA key detector string in 2/2
- Rephrased cover letter and patch descriptions with Mimi
Stefan Berger (4):
certs: Trigger creation of RSA module signing key if it's not an RSA
key
certs: Check whether openssl tool is available
certs: Add support for using elliptic curve keys for signing modules
certs: Adjustment due to 'Check whether openssl tool is available'
certs/Kconfig | 26 ++++++++++++++++++++++++++
certs/Makefile | 21 +++++++++++++++++++++
crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++
3 files changed, 55 insertions(+)
--
2.29.2
To avoid a good key from being removed because the openssl tool is
not installed and 'openssl x509' is not returning the expected result,
run the openssl tool commands only if the openssl tool is available.
Fixes: ec739868f340 ("certs: Trigger creation of RSA module signing key if it's not an RSA key")
Signed-off-by: Stefan Berger <[email protected]>
Reported-by: kernel test robot <[email protected]>
---
certs/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/certs/Makefile b/certs/Makefile
index e6f97c64aa99..72758684d254 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -57,15 +57,18 @@ 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 $(CONFIG_MODULE_SIG_KEY) -text)
$(if $(findstring rsaEncryption,$(X509TEXT)),,$(shell rm -f $(CONFIG_MODULE_SIG_KEY)))
+endif
$(obj)/signing_key.pem: $(obj)/x509.genkey
@$(kecho) "###"
--
2.29.2
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 <[email protected]>
---
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
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.
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")
Signed-off-by: Stefan Berger <[email protected]>
Reviewed-by: Jarkko Sakkinen <[email protected]>
Tested-by: Mimi Zohar <[email protected]>
Signed-off-by: Jarkko Sakkinen <[email protected]>
---
certs/Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/certs/Makefile b/certs/Makefile
index 359239a0ee9e..e6f97c64aa99 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -62,6 +62,11 @@ silent_redirect_openssl = 2>/dev/null
# 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")
+
+X509TEXT=$(shell openssl x509 -in $(CONFIG_MODULE_SIG_KEY) -text)
+
+$(if $(findstring rsaEncryption,$(X509TEXT)),,$(shell rm -f $(CONFIG_MODULE_SIG_KEY)))
+
$(obj)/signing_key.pem: $(obj)/x509.genkey
@$(kecho) "###"
@$(kecho) "### Now generating an X.509 key pair to be used for signing modules."
--
2.29.2
Add support for using elliptic curve keys for signing modules. It uses
a NIST P384 (secp384r1) key if the user chooses an elliptic curve key
and will have ECDSA support built into the kernel.
Note: A developer choosing an ECDSA key for signing modules should still
delete the signing key (rm certs/signing_key.*) when building an older
version of a kernel that only supports RSA keys. Unless kbuild automati-
cally detects and generates a new kernel module key, ECDSA-signed kernel
modules will fail signature verification.
Signed-off-by: Stefan Berger <[email protected]>
Acked-by: Jarkko Sakkinen <[email protected]>
Tested-by: Mimi Zohar <[email protected]>
Signed-off-by: Jarkko Sakkinen <[email protected]>
---
certs/Kconfig | 26 ++++++++++++++++++++++++++
certs/Makefile | 8 ++++++++
crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++
3 files changed, 42 insertions(+)
diff --git a/certs/Kconfig b/certs/Kconfig
index f4e61116f94e..916cbb1af928 100644
--- a/certs/Kconfig
+++ b/certs/Kconfig
@@ -15,6 +15,32 @@ config MODULE_SIG_KEY
then the kernel will automatically generate the private key and
certificate as described in Documentation/admin-guide/module-signing.rst
+choice
+ prompt "Type of module signing key to be generated"
+ default MODULE_SIG_KEY_TYPE_RSA
+ help
+ The type of module signing key type to generate. This option
+ does not apply if a #PKCS11 URI is used.
+
+config MODULE_SIG_KEY_TYPE_RSA
+ bool "RSA"
+ depends on MODULE_SIG || (IMA_APPRAISE_MODSIG && MODULES)
+ help
+ Use an RSA key for module signing.
+
+config MODULE_SIG_KEY_TYPE_ECDSA
+ bool "ECDSA"
+ select CRYPTO_ECDSA
+ depends on MODULE_SIG || (IMA_APPRAISE_MODSIG && MODULES)
+ help
+ Use an elliptic curve key (NIST P384) for module signing. Consider
+ using a strong hash like sha256 or sha384 for hashing modules.
+
+ Note: Remove all ECDSA signing keys, e.g. certs/signing_key.pem,
+ when falling back to building Linux 5.11 and older kernels.
+
+endchoice
+
config SYSTEM_TRUSTED_KEYRING
bool "Provide system-wide ring of trusted keys"
depends on KEYS
diff --git a/certs/Makefile b/certs/Makefile
index 72758684d254..dc9f354dd5f8 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -67,6 +67,13 @@ ifeq ($(CONFIG_MODULE_SIG_KEY),"certs/signing_key.pem")
ifeq ($(openssl_available),yes)
X509TEXT=$(shell openssl x509 -in $(CONFIG_MODULE_SIG_KEY) -text)
+# Support user changing key type
+ifdef CONFIG_MODULE_SIG_KEY_TYPE_ECDSA
+keytype_openssl = -newkey ec -pkeyopt ec_paramgen_curve:secp384r1
+$(if $(findstring id-ecPublicKey,$(X509TEXT)),,$(shell rm -f $(CONFIG_MODULE_SIG_KEY)))
+endif
+
+ifdef CONFIG_MODULE_SIG_KEY_TYPE_RSA
$(if $(findstring rsaEncryption,$(X509TEXT)),,$(shell rm -f $(CONFIG_MODULE_SIG_KEY)))
endif
@@ -83,6 +90,7 @@ $(obj)/signing_key.pem: $(obj)/x509.genkey
-batch -x509 -config $(obj)/x509.genkey \
-outform PEM -out $(obj)/signing_key.pem \
-keyout $(obj)/signing_key.pem \
+ $(keytype_openssl) \
$($(quiet)redirect_openssl)
@$(kecho) "###"
@$(kecho) "### Key pair generated."
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c
index 967329e0a07b..6592279d839a 100644
--- a/crypto/asymmetric_keys/pkcs7_parser.c
+++ b/crypto/asymmetric_keys/pkcs7_parser.c
@@ -269,6 +269,14 @@ int pkcs7_sig_note_pkey_algo(void *context, size_t hdrlen,
ctx->sinfo->sig->pkey_algo = "rsa";
ctx->sinfo->sig->encoding = "pkcs1";
break;
+ case OID_id_ecdsa_with_sha1:
+ case OID_id_ecdsa_with_sha224:
+ case OID_id_ecdsa_with_sha256:
+ case OID_id_ecdsa_with_sha384:
+ case OID_id_ecdsa_with_sha512:
+ ctx->sinfo->sig->pkey_algo = "ecdsa";
+ ctx->sinfo->sig->encoding = "x962";
+ break;
default:
printk("Unsupported pkey algo: %u\n", ctx->last_oid);
return -ENOPKG;
--
2.29.2
On 6/10/21 8:56 AM, Stefan Berger wrote:
>
> v6:
> - Patch 2/4 is fixing V4's 1/2 and 4/4 is fixing V4's 2/2. Both fixup
> patches to be squashed.
Jarkko, take 2/4 and 4/4 and squash them into the respective queued
patches. 1/4 and 3/4 are untouched other than what the rebase did to 3/4.
Stefan
On Thu, Jun 10, 2021 at 08:56:19AM -0400, Stefan Berger wrote:
> This series adds support for ECDSA-signed kernel modules. It also
> attempts to 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 bisecting the kernel for example, that does not support
> ECDSA keys.
>
> The first patch addresses the kbuild issue of needing to delete that
> ECDSA key if it is in certs/signing_key.pem and trigger the creation
> of an RSA key. However, for this to work this patch would have to be
> backported to previous versions of the kernel but would also only work
> for the developer if he/she used a stable version of the kernel to which
> this patch was applied. So whether this patch actually achieves the
> wanted effect is not always guaranteed.
>
> The 2nd patch adds the support for the ECSDA-signed kernel modules.
>
> This patch depends on the ECDSA support series currently queued here:
> https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/log/?h=ecc
>
> Stefan
>
> v6:
> - Patch 2/4 is fixing V4's 1/2 and 4/4 is fixing V4's 2/2. Both fixup
> patches to be squashed.
>
> v5:
> - do not touch the key files if openssl is not installed; likely
> addresses an issue pointed out by kernel test robot
>
> v4:
> - extending 'depends on' with MODULES to (IMA_APPRAISE_MODSIG && MODULES)
>
> v3: - added missing OIDs for ECDSA signed hashes to pkcs7_sig_note_pkey_algo
> - added recommendation to use string hash to Kconfig help text
>
> v2:
> - Adjustment to ECDSA key detector string in 2/2
> - Rephrased cover letter and patch descriptions with Mimi
>
>
> Stefan Berger (4):
> certs: Trigger creation of RSA module signing key if it's not an RSA
> key
> certs: Check whether openssl tool is available
> certs: Add support for using elliptic curve keys for signing modules
> certs: Adjustment due to 'Check whether openssl tool is available'
>
> certs/Kconfig | 26 ++++++++++++++++++++++++++
> certs/Makefile | 21 +++++++++++++++++++++
> crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++
> 3 files changed, 55 insertions(+)
>
> --
> 2.29.2
>
>
Since you know the commit ID's in
git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
you could just use fixes-tags and send exactly two patch series. Works
better with various tools (e.g. https://pypi.org/project/b4/)
/Jarkko
On 6/14/21 3:19 PM, Jarkko Sakkinen wrote:
> On Thu, Jun 10, 2021 at 08:56:19AM -0400, Stefan Berger wrote:
>> This series adds support for ECDSA-signed kernel modules. It also
>> attempts to 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 bisecting the kernel for example, that does not support
>> ECDSA keys.
>>
>> The first patch addresses the kbuild issue of needing to delete that
>> ECDSA key if it is in certs/signing_key.pem and trigger the creation
>> of an RSA key. However, for this to work this patch would have to be
>> backported to previous versions of the kernel but would also only work
>> for the developer if he/she used a stable version of the kernel to which
>> this patch was applied. So whether this patch actually achieves the
>> wanted effect is not always guaranteed.
>>
>> The 2nd patch adds the support for the ECSDA-signed kernel modules.
>>
>> This patch depends on the ECDSA support series currently queued here:
>> https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/log/?h=ecc
>>
>> Stefan
>>
>> v6:
>> - Patch 2/4 is fixing V4's 1/2 and 4/4 is fixing V4's 2/2. Both fixup
>> patches to be squashed.
>>
>> v5:
>> - do not touch the key files if openssl is not installed; likely
>> addresses an issue pointed out by kernel test robot
>>
>> v4:
>> - extending 'depends on' with MODULES to (IMA_APPRAISE_MODSIG && MODULES)
>>
>> v3: - added missing OIDs for ECDSA signed hashes to pkcs7_sig_note_pkey_algo
>> - added recommendation to use string hash to Kconfig help text
>>
>> v2:
>> - Adjustment to ECDSA key detector string in 2/2
>> - Rephrased cover letter and patch descriptions with Mimi
>>
>>
>> Stefan Berger (4):
>> certs: Trigger creation of RSA module signing key if it's not an RSA
>> key
>> certs: Check whether openssl tool is available
>> certs: Add support for using elliptic curve keys for signing modules
>> certs: Adjustment due to 'Check whether openssl tool is available'
>>
>> certs/Kconfig | 26 ++++++++++++++++++++++++++
>> certs/Makefile | 21 +++++++++++++++++++++
>> crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++
>> 3 files changed, 55 insertions(+)
>>
>> --
>> 2.29.2
>>
>>
> Since you know the commit ID's in
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
>
> you could just use fixes-tags and send exactly two patch series. Works
> better with various tools (e.g. https://pypi.org/project/b4/)
>
> /Jarkko
So you are not taking v6's 2/4 and 4/4 ?
On Thu, Jun 10, 2021 at 08:56:23AM -0400, Stefan Berger wrote:
> 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 <[email protected]>
> ---
> 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
>
>
Please check that they are applied correctly, thanks.
/Jarkko
On Mon, Jun 14, 2021 at 10:19:51PM +0300, Jarkko Sakkinen wrote:
> On Thu, Jun 10, 2021 at 08:56:19AM -0400, Stefan Berger wrote:
> > This series adds support for ECDSA-signed kernel modules. It also
> > attempts to 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 bisecting the kernel for example, that does not support
> > ECDSA keys.
> >
> > The first patch addresses the kbuild issue of needing to delete that
> > ECDSA key if it is in certs/signing_key.pem and trigger the creation
> > of an RSA key. However, for this to work this patch would have to be
> > backported to previous versions of the kernel but would also only work
> > for the developer if he/she used a stable version of the kernel to which
> > this patch was applied. So whether this patch actually achieves the
> > wanted effect is not always guaranteed.
> >
> > The 2nd patch adds the support for the ECSDA-signed kernel modules.
> >
> > This patch depends on the ECDSA support series currently queued here:
> > https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/log/?h=ecc
> >
> > Stefan
> >
> > v6:
> > - Patch 2/4 is fixing V4's 1/2 and 4/4 is fixing V4's 2/2. Both fixup
> > patches to be squashed.
> >
> > v5:
> > - do not touch the key files if openssl is not installed; likely
> > addresses an issue pointed out by kernel test robot
> >
> > v4:
> > - extending 'depends on' with MODULES to (IMA_APPRAISE_MODSIG && MODULES)
> >
> > v3: - added missing OIDs for ECDSA signed hashes to pkcs7_sig_note_pkey_algo
> > - added recommendation to use string hash to Kconfig help text
> >
> > v2:
> > - Adjustment to ECDSA key detector string in 2/2
> > - Rephrased cover letter and patch descriptions with Mimi
> >
> >
> > Stefan Berger (4):
> > certs: Trigger creation of RSA module signing key if it's not an RSA
> > key
> > certs: Check whether openssl tool is available
> > certs: Add support for using elliptic curve keys for signing modules
> > certs: Adjustment due to 'Check whether openssl tool is available'
> >
> > certs/Kconfig | 26 ++++++++++++++++++++++++++
> > certs/Makefile | 21 +++++++++++++++++++++
> > crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++
> > 3 files changed, 55 insertions(+)
> >
> > --
> > 2.29.2
> >
> >
>
> Since you know the commit ID's in
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
>
> you could just use fixes-tags and send exactly two patch series. Works
> better with various tools (e.g. https://pypi.org/project/b4/)
And also since then existence of ancestors is guaranteed.
/Jarkko
On 6/14/21 3:23 PM, Jarkko Sakkinen wrote:
> On Thu, Jun 10, 2021 at 08:56:23AM -0400, Stefan Berger wrote:
>> 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 <[email protected]>
>> ---
>> 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
>>
>>
> Please check that they are applied correctly, thanks.
No, they are not applied correctly. 2/2 shows this here:
ifeq ($(openssl_available),yes)
X509TEXT=$(shell openssl x509 -in $(CONFIG_MODULE_SIG_KEY) -text)
+endif
+
This endif is in 2/4 in v6 and should appear on your git in 1/2. How did
it get into 2/2?
https://lkml.org/lkml/2021/6/10/493
Stefan
>
> /Jarkko
On Mon, Jun 14, 2021 at 03:28:56PM -0400, Stefan Berger wrote:
>
> On 6/14/21 3:23 PM, Jarkko Sakkinen wrote:
> > On Thu, Jun 10, 2021 at 08:56:23AM -0400, Stefan Berger wrote:
> > > 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 <[email protected]>
> > > ---
> > > 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
> > >
> > >
> > Please check that they are applied correctly, thanks.
>
> No, they are not applied correctly. 2/2 shows this here:
>
>
> ?ifeq ($(openssl_available),yes)
> ?X509TEXT=$(shell openssl x509 -in $(CONFIG_MODULE_SIG_KEY) -text)
> +endif
> +
>
>
> This endif is in 2/4 in v6 and should appear on your git in 1/2. How did it
> get into 2/2?
>
> https://lkml.org/lkml/2021/6/10/493
I assumed that the two other commits are exact same as in v4 because
appropriate tags were mssing.
/Jarkko
On Mon, Jun 14, 2021 at 03:20:43PM -0400, Stefan Berger wrote:
>
> On 6/14/21 3:19 PM, Jarkko Sakkinen wrote:
> > On Thu, Jun 10, 2021 at 08:56:19AM -0400, Stefan Berger wrote:
> > > This series adds support for ECDSA-signed kernel modules. It also
> > > attempts to 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 bisecting the kernel for example, that does not support
> > > ECDSA keys.
> > >
> > > The first patch addresses the kbuild issue of needing to delete that
> > > ECDSA key if it is in certs/signing_key.pem and trigger the creation
> > > of an RSA key. However, for this to work this patch would have to be
> > > backported to previous versions of the kernel but would also only work
> > > for the developer if he/she used a stable version of the kernel to which
> > > this patch was applied. So whether this patch actually achieves the
> > > wanted effect is not always guaranteed.
> > >
> > > The 2nd patch adds the support for the ECSDA-signed kernel modules.
> > >
> > > This patch depends on the ECDSA support series currently queued here:
> > > https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/log/?h=ecc
> > >
> > > Stefan
> > >
> > > v6:
> > > - Patch 2/4 is fixing V4's 1/2 and 4/4 is fixing V4's 2/2. Both fixup
> > > patches to be squashed.
> > >
> > > v5:
> > > - do not touch the key files if openssl is not installed; likely
> > > addresses an issue pointed out by kernel test robot
> > >
> > > v4:
> > > - extending 'depends on' with MODULES to (IMA_APPRAISE_MODSIG && MODULES)
> > > v3: - added missing OIDs for ECDSA signed hashes to pkcs7_sig_note_pkey_algo
> > > - added recommendation to use string hash to Kconfig help text
> > >
> > > v2:
> > > - Adjustment to ECDSA key detector string in 2/2
> > > - Rephrased cover letter and patch descriptions with Mimi
> > >
> > >
> > > Stefan Berger (4):
> > > certs: Trigger creation of RSA module signing key if it's not an RSA
> > > key
> > > certs: Check whether openssl tool is available
> > > certs: Add support for using elliptic curve keys for signing modules
> > > certs: Adjustment due to 'Check whether openssl tool is available'
> > >
> > > certs/Kconfig | 26 ++++++++++++++++++++++++++
> > > certs/Makefile | 21 +++++++++++++++++++++
> > > crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++
> > > 3 files changed, 55 insertions(+)
> > >
> > > --
> > > 2.29.2
> > >
> > >
> > Since you know the commit ID's in
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
> >
> > you could just use fixes-tags and send exactly two patch series. Works
> > better with various tools (e.g. https://pypi.org/project/b4/)
> >
> > /Jarkko
>
>
> So you are not taking v6's 2/4 and 4/4 ?
I applied the fixes and squashed them to appriopriate commits.
/Jarkko
On 6/15/21 9:06 AM, Jarkko Sakkinen wrote:
> On Mon, Jun 14, 2021 at 03:28:56PM -0400, Stefan Berger wrote:
>> On 6/14/21 3:23 PM, Jarkko Sakkinen wrote:
>>> On Thu, Jun 10, 2021 at 08:56:23AM -0400, Stefan Berger wrote:
>>>> 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 <[email protected]>
>>>> ---
>>>> 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
>>>>
>>>>
>>> Please check that they are applied correctly, thanks.
>> No, they are not applied correctly. 2/2 shows this here:
>>
>>
>> ifeq ($(openssl_available),yes)
>> X509TEXT=$(shell openssl x509 -in $(CONFIG_MODULE_SIG_KEY) -text)
>> +endif
>> +
>>
>>
>> This endif is in 2/4 in v6 and should appear on your git in 1/2. How did it
>> get into 2/2?
>>
>> https://lkml.org/lkml/2021/6/10/493
> I assumed that the two other commits are exact same as in v4 because
> appropriate tags were mssing.
What's in your git repo now looks good.
Stefan
>
> /Jarkko
On Tue, Jun 15, 2021 at 09:29:08AM -0400, Stefan Berger wrote:
>
> On 6/15/21 9:06 AM, Jarkko Sakkinen wrote:
> > On Mon, Jun 14, 2021 at 03:28:56PM -0400, Stefan Berger wrote:
> > > On 6/14/21 3:23 PM, Jarkko Sakkinen wrote:
> > > > On Thu, Jun 10, 2021 at 08:56:23AM -0400, Stefan Berger wrote:
> > > > > 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 <[email protected]>
> > > > > ---
> > > > > 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
> > > > >
> > > > >
> > > > Please check that they are applied correctly, thanks.
> > > No, they are not applied correctly. 2/2 shows this here:
> > >
> > >
> > > ?ifeq ($(openssl_available),yes)
> > > ?X509TEXT=$(shell openssl x509 -in $(CONFIG_MODULE_SIG_KEY) -text)
> > > +endif
> > > +
> > >
> > >
> > > This endif is in 2/4 in v6 and should appear on your git in 1/2. How did it
> > > get into 2/2?
> > >
> > > https://lkml.org/lkml/2021/6/10/493
> > I assumed that the two other commits are exact same as in v4 because
> > appropriate tags were mssing.
>
> What's in your git repo now looks good.
OK, great.
/Jarkko