[PATCH] crypto: skip make dependency for CONFIG_CRYPTO_RSA_KEY=__ENV__*

[PATCH] crypto: skip make dependency for CONFIG_CRYPTO_RSA_KEY=__ENV__*

[Bastian Krause]

CONFIG_CRYPTO_RSA_KEY allows referring to environment variables, e.g.
__ENV__FOO tells barebox' rsatoc to use the value of the environment
variable "FOO".

There is no point in creating a make dependency for such values.
Actually looking into the environment variable and deciding whether it is
a PKCS#11 URI or a file seems unnecessarily complex. Let's filter out
these special values and leave the error handling to rsatoc.

Fixes: a05ac5545c ("crypto: simplify $(srctree)/ handling and remove config_filename macro")
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 crypto/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/Makefile b/crypto/Makefile
index 7e67f58bc7..762d7e543b 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -28,7 +28,7 @@ $(obj)/rsa.o: $(obj)/rsa-keys.h
 
 CONFIG_CRYPTO_RSA_KEY := $(CONFIG_CRYPTO_RSA_KEY:"%"=%)
 
-ifneq ($(filter-out pkcs11:%, $(CONFIG_CRYPTO_RSA_KEY)),)
+ifneq ($(filter-out pkcs11:% __ENV__%, $(CONFIG_CRYPTO_RSA_KEY)),)
 RSA_DEP := $(CONFIG_CRYPTO_RSA_KEY)
 endif
 
-- 
2.30.2

Re: [PATCH] crypto: skip make dependency for CONFIG_CRYPTO_RSA_KEY=__ENV__*

[Sascha Hauer]

On Fri, Jun 24, 2022 at 04:16:32PM +0200, Bastian Krause wrote:
> CONFIG_CRYPTO_RSA_KEY allows referring to environment variables, e.g.
> __ENV__FOO tells barebox' rsatoc to use the value of the environment
> variable "FOO".
> 
> There is no point in creating a make dependency for such values.
> Actually looking into the environment variable and deciding whether it is
> a PKCS#11 URI or a file seems unnecessarily complex. Let's filter out
> these special values and leave the error handling to rsatoc.
> 
> Fixes: a05ac5545c ("crypto: simplify $(srctree)/ handling and remove config_filename macro")
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
>  crypto/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/crypto/Makefile b/crypto/Makefile
> index 7e67f58bc7..762d7e543b 100644
> --- a/crypto/Makefile
> +++ b/crypto/Makefile
> @@ -28,7 +28,7 @@ $(obj)/rsa.o: $(obj)/rsa-keys.h
>  
>  CONFIG_CRYPTO_RSA_KEY := $(CONFIG_CRYPTO_RSA_KEY:"%"=%)
>  
> -ifneq ($(filter-out pkcs11:%, $(CONFIG_CRYPTO_RSA_KEY)),)
> +ifneq ($(filter-out pkcs11:% __ENV__%, $(CONFIG_CRYPTO_RSA_KEY)),)
>  RSA_DEP := $(CONFIG_CRYPTO_RSA_KEY)
>  endif
>  
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |