[zep noup] Enable sources when MCUBOOT_USE_PSA_CRYPTO and not MBEDTLS_PSA_CRYPTO_C

Gate relevant files for the thin PSA crypto core on MCUBOOT_USE_PSA_CRYPTO
during BL2 build instead of MBEDTLS_PSA_CRYPTO_C which is not defined in
such case. A full solution might require a change in config strategy of
Mbed TLS with the definition

Signed-off-by: Antonio de Angelis <[email protected]>

applied using:
git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\
0007-Enable-sources-when-MCUBOOT_USE_PSA_CRYPTO-and-not-M.patch

Signed-off-by: Tomi Fontanilles <[email protected]>

Author: adeaarm

CMakeLists.txt

@@ -315,15 +315,6 @@ if(LIB_INSTALL_DIR)
     set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
 endif()
 
-if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/framework/CMakeLists.txt")
-    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-        message(FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}CMakeLists.txt not found (and does appear to be a git checkout). Run `git submodule update --init` from the source tree to fetch the submodule contents.")
-    else ()
-        message(FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt not found (and does not appear to be a git checkout). Please ensure you have downloaded the right archive from the release page on GitHub.")
-    endif()
-endif()
-add_subdirectory(framework)
-
 add_subdirectory(include)
 
 add_subdirectory(3rdparty)

Makefile

@@ -2,25 +2,6 @@ DESTDIR=/usr/local
 PREFIX=mbedtls_
 PERL ?= perl
 
-ifneq (,$(filter-out lib library/%,$(or $(MAKECMDGOALS),all)))
-    ifeq (,$(wildcard framework/exported.make))
-        # Use the define keyword to get a multi-line message.
-        # GNU make appends ".  Stop.", so tweak the ending of our message accordingly.
-        ifneq (,$(wildcard .git))
-            define error_message
-${MBEDTLS_PATH}/framework/exported.make not found (and does appear to be a git checkout). Run `git submodule update --init` from the source tree to fetch the submodule contents.
-This is a fatal error
-            endef
-        else
-            define error_message
-${MBEDTLS_PATH}/framework/exported.make not found (and does not appear to be a git checkout). Please ensure you have downloaded the right archive from the release page on GitHub.
-            endef
-        endif
-        $(error $(error_message))
-    endif
-    include framework/exported.make
-endif
-
 .SILENT:
 
 .PHONY: all no_test programs lib tests install uninstall clean test check lcov apidoc apidoc_clean

include/mbedtls/psa_util.h

@@ -21,7 +21,7 @@
  * otherwise error codes would be unknown in test_suite_psa_crypto_util.data.*/
 #include <mbedtls/asn1write.h>
 
-#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
+#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 /** The random generator function for the PSA subsystem.
  *

library/Makefile

@@ -8,20 +8,6 @@ GENERATED_FILES := \
 	psa_crypto_driver_wrappers.h \
 	psa_crypto_driver_wrappers_no_static.c
 
-ifneq ($(GENERATED_FILES),$(wildcard $(GENERATED_FILES)))
-    ifeq (,$(wildcard $(MBEDTLS_PATH)/framework/exported.make))
-        # Use the define keyword to get a multi-line message.
-        # GNU make appends ".  Stop.", so tweak the ending of our message accordingly.
-        define error_message
-$(MBEDTLS_PATH)/framework/exported.make not found.
-Run `git submodule update --init` to fetch the submodule contents.
-This is a fatal error
-        endef
-        $(error $(error_message))
-    endif
-    include $(MBEDTLS_PATH)/framework/exported.make
-endif
-
 # Also see "include/mbedtls/mbedtls_config.h"
 
 CFLAGS	?= -O2

library/psa_crypto_driver_wrappers.h

@@ -23,7 +23,7 @@
 #include "mbedtls/constant_time.h"
 /* END-common headers */
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 /* BEGIN-driver headers */
 /* Headers for mbedtls_test opaque driver */

library/psa_crypto_ecp.c

@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 #include <psa/crypto.h>
 #include "psa_crypto_core.h"

library/psa_crypto_hash.c

@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 #include <psa/crypto.h>
 #include "psa_crypto_core.h"

library/psa_crypto_rsa.c

@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 #include <psa/crypto.h>
 #include "psa/crypto_values.h"

scripts/common.make

@@ -4,18 +4,6 @@ ifndef MBEDTLS_PATH
 MBEDTLS_PATH := ..
 endif
 
-ifeq (,$(wildcard $(MBEDTLS_PATH)/framework/exported.make))
-    # Use the define keyword to get a multi-line message.
-    # GNU make appends ".  Stop.", so tweak the ending of our message accordingly.
-    define error_message
-$(MBEDTLS_PATH)/framework/exported.make not found.
-Run `git submodule update --init` to fetch the submodule contents.
-This is a fatal error
-    endef
-    $(error $(error_message))
-endif
-include $(MBEDTLS_PATH)/framework/exported.make
-
 CFLAGS	?= -O2
 WARNING_CFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral
 WARNING_CXXFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral -std=c++11 -pedantic