From 5582ec9d3a21c546b799d2f6d4928f5e1d19eb0a Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Mon, 24 Feb 2025 22:22:08 +0100 Subject: [PATCH] openssl: honour calling environment's values in wrapper script When using openssl with some pkcs#11 plugin module, one (usually) needs to set the OPENSSL_CONF environment variable appropriately, and e.g. invoke openssl as openssl dgst -engine pkcs11 -keyform engine ... However, when putting that logic in a bitbake recipe and depending on openssl-native (and the recipe providing the pkcs#11 engine and the associated configuration file), the value of OPENSSL_CONF is unconditionally overridden by the wrapper script. If openssl was invoked directly in the task function, I could probably call "openssl.real" instead, but then I miss the proper settings of the other four variables, which I'd then also have to repeat in my recipe. Moreover, sometimes openssl is only called via some helper script (for example rpi-eeprom-digest for signing bootloader images for RPi), and it's not reasonable to patch every such script to call openssl.real. So rewrite the wrapper such that if a variable is already set in the environment before openssl is invoked, preserve its value. Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_3.4.1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl_3.4.1.bb b/meta/recipes-connectivity/openssl/openssl_3.4.1.bb index e18ec4b1ad8..1a054a36753 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.4.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.4.1.bb @@ -176,11 +176,11 @@ do_install () { do_install:append:class-native () { create_wrapper ${D}${bindir}/openssl \ - OPENSSL_CONF=${libdir}/ssl-3/openssl.cnf \ - SSL_CERT_DIR=${libdir}/ssl-3/certs \ - SSL_CERT_FILE=${libdir}/ssl-3/cert.pem \ - OPENSSL_ENGINES=${libdir}/engines-3 \ - OPENSSL_MODULES=${libdir}/ossl-modules + OPENSSL_CONF=\${OPENSSL_CONF:-${libdir}/ssl-3/openssl.cnf} \ + SSL_CERT_DIR=\${SSL_CERT_DIR:-${libdir}/ssl-3/certs} \ + SSL_CERT_FILE=\${SSL_CERT_FILE:-${libdir}/ssl-3/cert.pem} \ + OPENSSL_ENGINES=\${OPENSSL_ENGINES:-${libdir}/engines-3} \ + OPENSSL_MODULES=\${OPENSSL_MODULES:-${libdir}/ossl-modules} } do_install:append:class-nativesdk () { -- 2.47.3