CMake: Move build of the crypto library to tf-psa-crypto
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index da635db..007aa35 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -5,27 +5,6 @@
set(MBEDTLS_DIR ${CMAKE_SOURCE_DIR})
endif()
-set(TF_PSA_CRYPTO_CORE_DIR ../tf-psa-crypto/core)
-
-set(src_crypto
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_aead.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_cipher.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_client.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_driver_wrappers_no_static.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_ecp.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_ffdh.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_hash.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_mac.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_pake.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_rsa.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_se.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_slot_management.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_storage.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_its_file.c
- ${TF_PSA_CRYPTO_CORE_DIR}/psa_util.c
-)
-
set(src_x509
pkcs7.c
x509.c
@@ -72,24 +51,8 @@
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/generate_ssl_debug_helpers.py
${tls_error_headers}
)
-
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_driver_wrappers.h
- ${CMAKE_CURRENT_BINARY_DIR}/${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_driver_wrappers_no_static.c
- COMMAND
- ${MBEDTLS_PYTHON_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/generate_driver_wrappers.py
- ${CMAKE_CURRENT_BINARY_DIR}/${TF_PSA_CRYPTO_CORE_DIR}
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/generate_driver_wrappers.py
- ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja
- ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/data_files/driver_templates/psa_crypto_driver_wrappers_no_static.c.jinja
- )
else()
link_to_source(ssl_debug_helpers_generated.c)
- link_to_source(${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_driver_wrappers.h)
- link_to_source(${TF_PSA_CRYPTO_CORE_DIR}/psa_crypto_driver_wrappers_no_static.c)
endif()
if(CMAKE_COMPILER_IS_GNUCC)
@@ -129,10 +92,6 @@
set(libs ${libs} ${CMAKE_THREAD_LIBS_INIT})
endif()
-if(LINK_WITH_TRUSTED_STORAGE)
- set(libs ${libs} trusted_storage)
-endif()
-
if (NOT USE_STATIC_MBEDTLS_LIBRARY AND NOT USE_SHARED_MBEDTLS_LIBRARY)
message(FATAL_ERROR "Need to choose static or shared mbedtls build!")
endif(NOT USE_STATIC_MBEDTLS_LIBRARY AND NOT USE_SHARED_MBEDTLS_LIBRARY)
@@ -148,36 +107,18 @@
set(mbedx509_static_target ${mbedx509_target})
endif()
-set(target_libraries ${mbedcrypto_target} ${mbedx509_target} ${mbedtls_target})
+set(target_libraries ${mbedx509_target} ${mbedtls_target})
if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY)
string(APPEND mbedtls_static_target "_static")
string(APPEND mbedx509_static_target "_static")
list(APPEND target_libraries
- ${mbedcrypto_static_target}
${mbedx509_static_target}
${mbedtls_static_target})
endif()
-set(p256m_target "${MBEDTLS_TARGET_PREFIX}p256m")
-set(everest_target "${MBEDTLS_TARGET_PREFIX}everest")
-
if(USE_STATIC_MBEDTLS_LIBRARY)
- add_library(${mbedcrypto_static_target} STATIC ${src_crypto})
- set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto)
- target_link_libraries(${mbedcrypto_static_target} PUBLIC ${libs})
-
- target_link_libraries(${mbedcrypto_static_target} PUBLIC ${builtin_static_target})
-
- if(TARGET ${everest_target})
- target_link_libraries(${mbedcrypto_static_target} PUBLIC ${everest_target})
- endif()
-
- if(TARGET ${p256m_target})
- target_link_libraries(${mbedcrypto_static_target} PUBLIC ${p256m_target})
- endif()
-
add_library(${mbedx509_static_target} STATIC ${src_x509})
set_target_properties(${mbedx509_static_target} PROPERTIES OUTPUT_NAME mbedx509)
target_link_libraries(${mbedx509_static_target} PUBLIC ${libs} ${mbedcrypto_static_target})
@@ -188,21 +129,6 @@
endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY)
- set(CMAKE_LIBRARY_PATH ${CMAKE_CURRENT_BINARY_DIR})
- add_library(${mbedcrypto_target} SHARED ${src_crypto})
- set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 4.0.0 SOVERSION 16)
- target_link_libraries(${mbedcrypto_target} PUBLIC ${libs})
-
- target_link_libraries(${mbedcrypto_target} PUBLIC ${builtin_target})
-
- if(TARGET ${everest_target})
- target_link_libraries(${mbedcrypto_target} PUBLIC ${everest_target})
- endif()
-
- if(TARGET ${p256m_target})
- target_link_libraries(${mbedcrypto_target} PUBLIC ${p256m_target})
- endif()
-
add_library(${mbedx509_target} SHARED ${src_x509})
set_target_properties(${mbedx509_target} PROPERTIES VERSION 4.0.0 SOVERSION 7)
target_link_libraries(${mbedx509_target} PUBLIC ${libs} ${mbedcrypto_target})
@@ -224,9 +150,7 @@
$<INSTALL_INTERFACE:include/>
PRIVATE ${MBEDTLS_DIR}/library/
${MBEDTLS_DIR}/tf-psa-crypto/core
- ${MBEDTLS_DIR}/tf-psa-crypto/drivers/builtin/src
- # Needed to include psa_crypto_driver_wrappers.h
- ${CMAKE_CURRENT_BINARY_DIR}/../tf-psa-crypto/core)
+ ${MBEDTLS_DIR}/tf-psa-crypto/drivers/builtin/src)
# Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
if(MBEDTLS_CONFIG_FILE)
target_compile_definitions(${target}
@@ -247,7 +171,7 @@
set(lib_target "${MBEDTLS_TARGET_PREFIX}lib")
-add_custom_target(${lib_target} DEPENDS ${mbedcrypto_target} ${mbedx509_target} ${mbedtls_target})
+add_custom_target(${lib_target} DEPENDS ${mbedx509_target} ${mbedtls_target})
if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY)
- add_dependencies(${lib_target} ${mbedcrypto_static_target} ${mbedx509_static_target} ${mbedtls_static_target})
+ add_dependencies(${lib_target} ${mbedx509_static_target} ${mbedtls_static_target})
endif()