From ada6ce58ea9e639a6090072f19f8ea397c742aab Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 9 Sep 2024 10:47:39 +0200 Subject: [PATCH 1/5] Update framework to latest Signed-off-by: Ronald Cron --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index 94599c0e3..053518c2c 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 94599c0e3b5036e086446a51a3f79640f70f22f6 +Subproject commit 053518c2ca152b6ae5e791b5d655e539de8bee3e From 932878137a4cebecbc2de4845272c8aa773b0964 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 9 Sep 2024 10:17:52 +0200 Subject: [PATCH 2/5] Use scripts/project_name.txt in Python scripts Use scripts/project_name.txt in Python scripts to detect between Mbed TLS and TF-PSA-Crypto project. Signed-off-by: Ronald Cron --- framework | 2 +- tf-psa-crypto/scripts/project_name.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 tf-psa-crypto/scripts/project_name.txt diff --git a/framework b/framework index 053518c2c..fe72c06e4 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 053518c2ca152b6ae5e791b5d655e539de8bee3e +Subproject commit fe72c06e406e7a4e3fbfad917dccba884cf64213 diff --git a/tf-psa-crypto/scripts/project_name.txt b/tf-psa-crypto/scripts/project_name.txt new file mode 100644 index 000000000..94a73faa2 --- /dev/null +++ b/tf-psa-crypto/scripts/project_name.txt @@ -0,0 +1 @@ +TF-PSA-Crypto From 7ba04a298cc648255b820d9b5ad184528a6ea5ca Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Tue, 3 Sep 2024 17:36:30 +0100 Subject: [PATCH 3/5] Bump version to 4.0.0 Signed-off-by: David Horstmann --- CMakeLists.txt | 6 +++--- doxygen/input/doc_mainpage.h | 2 +- doxygen/mbedtls.doxyfile | 2 +- include/mbedtls/build_info.h | 10 +++++----- library/CMakeLists.txt | 6 +++--- tf-psa-crypto/tests/suites/test_suite_version.data | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df4bf6bb2..b1af5667d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,12 +40,12 @@ cmake_policy(SET CMP0012 NEW) if(TEST_CPP) project("Mbed TLS" LANGUAGES C CXX - VERSION 3.6.0 + VERSION 4.0.0 ) else() project("Mbed TLS" LANGUAGES C - VERSION 3.6.0 + VERSION 4.0.0 ) endif() @@ -458,7 +458,7 @@ if(NOT DISABLE_PACKAGE_CONFIG_AND_INSTALL) write_basic_package_version_file( "cmake/MbedTLSConfigVersion.cmake" COMPATIBILITY SameMajorVersion - VERSION 3.6.0) + VERSION 4.0.0) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/MbedTLSConfig.cmake" diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index 3eb5f7555..fb4439adc 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -10,7 +10,7 @@ */ /** - * @mainpage Mbed TLS v3.6.0 API Documentation + * @mainpage Mbed TLS v4.0.0 API Documentation * * This documentation describes the internal structure of Mbed TLS. It was * automatically generated from specially formatted comment blocks in diff --git a/doxygen/mbedtls.doxyfile b/doxygen/mbedtls.doxyfile index 1e494a0de..917b88d75 100644 --- a/doxygen/mbedtls.doxyfile +++ b/doxygen/mbedtls.doxyfile @@ -1,4 +1,4 @@ -PROJECT_NAME = "Mbed TLS v3.6.0" +PROJECT_NAME = "Mbed TLS v4.0.0" OUTPUT_DIRECTORY = ../apidoc/ FULL_PATH_NAMES = NO OPTIMIZE_OUTPUT_FOR_C = YES diff --git a/include/mbedtls/build_info.h b/include/mbedtls/build_info.h index cf38f9098..2b48e5034 100644 --- a/include/mbedtls/build_info.h +++ b/include/mbedtls/build_info.h @@ -24,8 +24,8 @@ * The version number x.y.z is split into three parts. * Major, Minor, Patchlevel */ -#define MBEDTLS_VERSION_MAJOR 3 -#define MBEDTLS_VERSION_MINOR 6 +#define MBEDTLS_VERSION_MAJOR 4 +#define MBEDTLS_VERSION_MINOR 0 #define MBEDTLS_VERSION_PATCH 0 /** @@ -33,9 +33,9 @@ * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x03060000 -#define MBEDTLS_VERSION_STRING "3.6.0" -#define MBEDTLS_VERSION_STRING_FULL "Mbed TLS 3.6.0" +#define MBEDTLS_VERSION_NUMBER 0x04000000 +#define MBEDTLS_VERSION_STRING "4.0.0" +#define MBEDTLS_VERSION_STRING_FULL "Mbed TLS 4.0.0" /* Macros for build-time platform detection */ diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 2e18d2b9a..0f758223d 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -304,7 +304,7 @@ 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 3.6.0 SOVERSION 16) + set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 4.0.0 SOVERSION 16) target_link_libraries(${mbedcrypto_target} PUBLIC ${libs}) if(TARGET ${everest_target}) @@ -316,11 +316,11 @@ if(USE_SHARED_MBEDTLS_LIBRARY) endif() add_library(${mbedx509_target} SHARED ${src_x509}) - set_target_properties(${mbedx509_target} PROPERTIES VERSION 3.6.0 SOVERSION 7) + set_target_properties(${mbedx509_target} PROPERTIES VERSION 4.0.0 SOVERSION 7) target_link_libraries(${mbedx509_target} PUBLIC ${libs} ${mbedcrypto_target}) add_library(${mbedtls_target} SHARED ${src_tls}) - set_target_properties(${mbedtls_target} PROPERTIES VERSION 3.6.0 SOVERSION 21) + set_target_properties(${mbedtls_target} PROPERTIES VERSION 4.0.0 SOVERSION 21) target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target}) endif(USE_SHARED_MBEDTLS_LIBRARY) diff --git a/tf-psa-crypto/tests/suites/test_suite_version.data b/tf-psa-crypto/tests/suites/test_suite_version.data index 0edee9681..3a21f1b14 100644 --- a/tf-psa-crypto/tests/suites/test_suite_version.data +++ b/tf-psa-crypto/tests/suites/test_suite_version.data @@ -1,8 +1,8 @@ Check compile time library version -check_compiletime_version:"3.6.0" +check_compiletime_version:"4.0.0" Check runtime library version -check_runtime_version:"3.6.0" +check_runtime_version:"4.0.0" Check for MBEDTLS_VERSION_C check_feature:"MBEDTLS_VERSION_C":0 From 22eb209c3ad409c111464702825eabeefbc027f6 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 9 Sep 2024 13:46:41 +0200 Subject: [PATCH 4/5] Update framework Signed-off-by: Ronald Cron --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index fe72c06e4..024916493 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit fe72c06e406e7a4e3fbfad917dccba884cf64213 +Subproject commit 0249164939b6bed24772d0e8214be4c3b239b845 From 25012e5f8169372cd5cec4e145b36edf1d24bd02 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 11 Sep 2024 14:55:06 +0200 Subject: [PATCH 5/5] Update framework to the merge of #45 Signed-off-by: Ronald Cron --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index 024916493..7acada6a9 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 0249164939b6bed24772d0e8214be4c3b239b845 +Subproject commit 7acada6a928031340d390b2dce645a3b6129ddad