diff options
| author | Salome Thirot <salome.thirot@arm.com> | 2022-07-14 16:14:15 +0100 |
|---|---|---|
| committer | Salome Thirot <salome.thirot@arm.com> | 2022-08-04 10:45:46 +0100 |
| commit | e95abc4c01822ef43e9e874d63d6596dc0b57279 (patch) | |
| tree | f02f78f766a06a6eb5310f5f21768fd885a1a7d3 /plat/rpi | |
| parent | 17e76b5eb7901534ff9ee3f62b9990ba6038b002 (diff) | |
| download | arm-trusted-firmware-e95abc4c01822ef43e9e874d63d6596dc0b57279.tar.gz | |
fix: make TF-A use provided OpenSSL binary
Currently Tf-A uses whatever openssl binary is on the system to sign
images. However if OPENSSL_DIR is specified in the build flags this can
lead to linking issues as the system binary can end up being linked
against shared libraries provided in OPENSSL_DIR/lib if both binaries
(the system's and the on in OPENSSL_DIR/bin) are the same version.
This patch ensures that the binary used is always the one given by
OPENSSL_DIR to avoid those link issues.
Signed-off-by: Salome Thirot <salome.thirot@arm.com>
Change-Id: Ib534e06ebc8482e4391e376d3791a87968de4a99
Diffstat (limited to 'plat/rpi')
| -rw-r--r-- | plat/rpi/rpi3/platform.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/rpi/rpi3/platform.mk b/plat/rpi/rpi3/platform.mk index 6c239230d..53c97e225 100644 --- a/plat/rpi/rpi3/platform.mk +++ b/plat/rpi/rpi3/platform.mk @@ -212,10 +212,10 @@ ifneq (${TRUSTED_BOARD_BOOT},0) $(ROT_KEY): | $(BUILD_PLAT) @echo " OPENSSL $@" - $(Q)openssl genrsa 2048 > $@ 2>/dev/null + $(Q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null $(ROTPK_HASH): $(ROT_KEY) @echo " OPENSSL $@" - $(Q)openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ - openssl dgst -sha256 -binary > $@ 2>/dev/null + $(Q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ + ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null endif |