From 760165741805da32640189c3fbe0981f6f75337d Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Wed, 30 Jun 2021 23:08:08 +0100 Subject: [PATCH] Bump library version numbers Signed-off-by: Dave Rodgman --- doxygen/input/doc_mainpage.h | 2 +- doxygen/mbedtls.doxyfile | 2 +- library/CMakeLists.txt | 6 +++--- library/Makefile | 6 +++--- tests/suites/test_suite_version.data | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index f879f33310..4ff18a37ce 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -22,7 +22,7 @@ */ /** - * @mainpage mbed TLS v2.26.0 source code documentation + * @mainpage mbed TLS v3.0.0 source code 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 dd84c2871d..7a214c994e 100644 --- a/doxygen/mbedtls.doxyfile +++ b/doxygen/mbedtls.doxyfile @@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8 # identify the project. Note that if you do not use Doxywizard you need # to put quotes around the project name if it contains spaces. -PROJECT_NAME = "mbed TLS v2.26.0" +PROJECT_NAME = "mbed TLS v3.0.0" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 14fecff9da..5faae2b63f 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -188,7 +188,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY) add_library(${mbedcrypto_target} SHARED ${src_crypto}) - set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 2.26.0 SOVERSION 6) + set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 3.0.0 SOVERSION 7) target_link_libraries(${mbedcrypto_target} PUBLIC ${libs}) if(TARGET everest) @@ -196,11 +196,11 @@ if(USE_SHARED_MBEDTLS_LIBRARY) endif() add_library(${mbedx509_target} SHARED ${src_x509}) - set_target_properties(${mbedx509_target} PROPERTIES VERSION 2.26.0 SOVERSION 1) + set_target_properties(${mbedx509_target} PROPERTIES VERSION 3.0.0 SOVERSION 2) target_link_libraries(${mbedx509_target} PUBLIC ${libs} ${mbedcrypto_target}) add_library(${mbedtls_target} SHARED ${src_tls}) - set_target_properties(${mbedtls_target} PROPERTIES VERSION 2.26.0 SOVERSION 13) + set_target_properties(${mbedtls_target} PROPERTIES VERSION 3.0.0 SOVERSION 14) target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target}) endif(USE_SHARED_MBEDTLS_LIBRARY) diff --git a/library/Makefile b/library/Makefile index 3f54bacb42..06bd09a980 100644 --- a/library/Makefile +++ b/library/Makefile @@ -41,9 +41,9 @@ LOCAL_CFLAGS += -fPIC -fpic endif endif -SOEXT_TLS=so.13 -SOEXT_X509=so.1 -SOEXT_CRYPTO=so.6 +SOEXT_TLS=so.14 +SOEXT_X509=so.2 +SOEXT_CRYPTO=so.7 # Set AR_DASH= (empty string) to use an ar implementation that does not accept # the - prefix for command line options (e.g. llvm-ar) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index e4da3d4806..0b5e426bb0 100644 --- a/tests/suites/test_suite_version.data +++ b/tests/suites/test_suite_version.data @@ -1,8 +1,8 @@ Check compiletime library version -check_compiletime_version:"2.26.0" +check_compiletime_version:"3.0.0" Check runtime library version -check_runtime_version:"2.26.0" +check_runtime_version:"3.0.0" Check for MBEDTLS_VERSION_C check_feature:"MBEDTLS_VERSION_C":0