[ptxdist] [PATCH] scripts: lib: ptxd_lib_code_signing: use pkey instead of rsa

[ptxdist] [PATCH] scripts: lib: ptxd_lib_code_signing: use pkey instead of rsa

[Michael Grzeschik]

This way openssl will automatically detect the used algorithm
of the pem and the helper is not limited to rsa.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 scripts/lib/ptxd_lib_code_signing.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/ptxd_lib_code_signing.sh b/scripts/lib/ptxd_lib_code_signing.sh
index bafdc1654..a98596b28 100644
--- a/scripts/lib/ptxd_lib_code_signing.sh
+++ b/scripts/lib/ptxd_lib_code_signing.sh
@@ -233,7 +233,7 @@ cs_import_pubkey_from_pem() {
 	openssl_keyopt=( -passin "file:${OPENSSL_KEYPASS}" )
     fi
 
-    openssl rsa \
+    openssl pkey \
 	"${openssl_keyopt[@]}" \
 	-in "${pem}" -inform pem -pubout -outform der |
     softhsm_pkcs11_tool --type pubkey --write-object /dev/stdin --label "${role}"
@@ -257,7 +257,7 @@ cs_import_privkey_from_pem() {
 	openssl_keyopt=( -passin "file:${OPENSSL_KEYPASS}" )
     fi
 
-    openssl rsa \
+    openssl pkey \
 	"${openssl_keyopt[@]}" \
 	-in "${pem}" -inform pem -outform der |
     softhsm_pkcs11_tool --type privkey --write-object /dev/stdin --label "${role}"
-- 
2.39.5

Re: [ptxdist] [APPLIED] scripts: lib: ptxd_lib_code_signing: use pkey instead of rsa

[Michael Olbrich]

Thanks, applied as 363a007e38bcfb9205c5e8fb1787aad1f021f1ce.

Michael

[sent from post-receive hook]

On Fri, 25 Oct 2024 09:32:54 +0200, Michael Grzeschik <m.grzeschik@pengutronix.de> wrote:
> This way openssl will automatically detect the used algorithm
> of the pem and the helper is not limited to rsa.
> 
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> Message-Id: <20241010233115.98774-1-m.grzeschik@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_lib_code_signing.sh b/scripts/lib/ptxd_lib_code_signing.sh
> index bafdc16544d3..a98596b28651 100644
> --- a/scripts/lib/ptxd_lib_code_signing.sh
> +++ b/scripts/lib/ptxd_lib_code_signing.sh
> @@ -233,7 +233,7 @@ cs_import_pubkey_from_pem() {
>  	openssl_keyopt=( -passin "file:${OPENSSL_KEYPASS}" )
>      fi
>  
> -    openssl rsa \
> +    openssl pkey \
>  	"${openssl_keyopt[@]}" \
>  	-in "${pem}" -inform pem -pubout -outform der |
>      softhsm_pkcs11_tool --type pubkey --write-object /dev/stdin --label "${role}"
> @@ -257,7 +257,7 @@ cs_import_privkey_from_pem() {
>  	openssl_keyopt=( -passin "file:${OPENSSL_KEYPASS}" )
>      fi
>  
> -    openssl rsa \
> +    openssl pkey \
>  	"${openssl_keyopt[@]}" \
>  	-in "${pem}" -inform pem -outform der |
>      softhsm_pkcs11_tool --type privkey --write-object /dev/stdin --label "${role}"