mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-18 02:24:18 +00:00
cf2dd17ddd
When updated to work with OpenSSL 3.0, the host tools lost their compatibility with previous versions (1.x) of OpenSSL. This is mainly due to the fact that 1.x APIs became deprecated in 3.0 and therefore their use cause compiling errors. In addition, updating for a newer version of OpenSSL meant improving the stability against security threats. However, although version 1.1.1 is now deprecated, it still receives security updates, so it would not imply major security issues to keep compatibility with it too. This patch adds backwards compatibility with OpenSSL 1.x versions by adding back 1.x API code. It defines a macro USING_OPENSSL3, which will select the appropriate OpenSSL API version depending on the OpenSSL library path chosen (which is determined by the already-existing OPENSSL_DIR variable). In addition, cleanup items were packed in functions and moved to the proper modules in order to make the code more maintainable and legible. Signed-off-by: Juan Pablo Conde <juanpablo.conde@arm.com> Change-Id: I8deceb5e419edc73277792861882404790ccd33c
86 lines
2.2 KiB
Makefile
86 lines
2.2 KiB
Makefile
#
|
|
# Copyright (c) 2014-2022, Arm Limited and Contributors. All rights reserved.
|
|
#
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
#
|
|
|
|
MAKE_HELPERS_DIRECTORY := ../../make_helpers/
|
|
include ${MAKE_HELPERS_DIRECTORY}build_macros.mk
|
|
include ${MAKE_HELPERS_DIRECTORY}build_env.mk
|
|
include ${MAKE_HELPERS_DIRECTORY}defaults.mk
|
|
|
|
FIPTOOL ?= fiptool${BIN_EXT}
|
|
PROJECT := $(notdir ${FIPTOOL})
|
|
OBJECTS := fiptool.o tbbr_config.o
|
|
V ?= 0
|
|
OPENSSL_DIR := /usr
|
|
|
|
|
|
override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700
|
|
HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99
|
|
ifeq (${DEBUG},1)
|
|
HOSTCCFLAGS += -g -O0 -DDEBUG
|
|
else
|
|
HOSTCCFLAGS += -O2
|
|
endif
|
|
|
|
# Select OpenSSL version flag according to the OpenSSL build selected
|
|
# from setting the OPENSSL_DIR path.
|
|
$(eval $(call SELECT_OPENSSL_API_VERSION))
|
|
|
|
HOSTCCFLAGS += ${DEFINES}
|
|
# USING_OPENSSL3 flag will be added to the HOSTCCFLAGS variable with the proper
|
|
# computed value.
|
|
HOSTCCFLAGS += -DUSING_OPENSSL3=$(USING_OPENSSL3)
|
|
|
|
# Include library directories where OpenSSL library files are located.
|
|
# For a normal installation (i.e.: when ${OPENSSL_DIR} = /usr or
|
|
# /usr/local), binaries are located under the ${OPENSSL_DIR}/lib/
|
|
# directory. However, for a local build of OpenSSL, the built binaries are
|
|
# located under the main project directory (i.e.: ${OPENSSL_DIR}, not
|
|
# ${OPENSSL_DIR}/lib/).
|
|
LDLIBS := -L${OPENSSL_DIR}/lib -L${OPENSSL_DIR} -lcrypto
|
|
|
|
ifeq (${V},0)
|
|
Q := @
|
|
else
|
|
Q :=
|
|
endif
|
|
|
|
INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include
|
|
|
|
HOSTCC ?= gcc
|
|
|
|
ifneq (${PLAT},)
|
|
TF_PLATFORM_ROOT := ../../plat/
|
|
include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk
|
|
PLAT_FIPTOOL_HELPER_MK := ${PLAT_DIR}/plat_fiptool.mk
|
|
endif
|
|
|
|
ifneq (,$(wildcard ${PLAT_FIPTOOL_HELPER_MK}))
|
|
include ${PLAT_FIPTOOL_HELPER_MK}
|
|
endif
|
|
|
|
.PHONY: all clean distclean --openssl
|
|
|
|
all: ${PROJECT}
|
|
|
|
${PROJECT}: --openssl ${OBJECTS} Makefile
|
|
@echo " HOSTLD $@"
|
|
${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
|
|
@${ECHO_BLANK_LINE}
|
|
@echo "Built $@ successfully"
|
|
@${ECHO_BLANK_LINE}
|
|
|
|
%.o: %.c Makefile
|
|
@echo " HOSTCC $<"
|
|
${Q}${HOSTCC} -c ${CPPFLAGS} ${HOSTCCFLAGS} ${INCLUDE_PATHS} $< -o $@
|
|
|
|
--openssl:
|
|
ifeq ($(DEBUG),1)
|
|
@echo "Selected OpenSSL version: ${OPENSSL_CURRENT_VER}"
|
|
endif
|
|
|
|
|
|
clean:
|
|
$(call SHELL_DELETE_ALL, ${PROJECT} ${OBJECTS})
|