[PATCH v6 4/4] certs: Adjustment due to 'Check whether openssl tool is available'

[Jarkko Sakkinen]

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 <stefanb at 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
> 
> 

Please check that they are applied correctly, thanks.

/Jarkko