mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
77c10c60a4
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. (From OE-Core rev: 5582ec9d3a21c546b799d2f6d4928f5e1d19eb0a) Signed-off-by: Rasmus Villemoes <ravi@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>