diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | doxygen/input/doc_mainpage.h | 2 | ||||
| -rw-r--r-- | doxygen/mbedtls.doxyfile | 2 | ||||
| -rw-r--r-- | include/mbedtls/build_info.h | 8 | ||||
| -rw-r--r-- | library/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | library/Makefile | 4 | ||||
| -rw-r--r-- | tests/suites/test_suite_version.data | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b97368f..2610359 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,7 +348,7 @@ if(NOT DISABLE_PACKAGE_CONFIG_AND_INSTALL) write_basic_package_version_file( "cmake/MbedTLSConfigVersion.cmake" COMPATIBILITY SameMajorVersion - VERSION 3.1.0) + VERSION 3.2.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 1c2be1a..282e9bf 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -22,7 +22,7 @@ */ /** - * @mainpage mbed TLS v3.1.0 source code documentation + * @mainpage mbed TLS v3.2.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 6d104c8..653babc 100644 --- a/doxygen/mbedtls.doxyfile +++ b/doxygen/mbedtls.doxyfile @@ -1,4 +1,4 @@ -PROJECT_NAME = "mbed TLS v3.1.0" +PROJECT_NAME = "mbed TLS v3.2.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 3dd944c..75545f2 100644 --- a/include/mbedtls/build_info.h +++ b/include/mbedtls/build_info.h @@ -37,7 +37,7 @@ * Major, Minor, Patchlevel */ #define MBEDTLS_VERSION_MAJOR 3 -#define MBEDTLS_VERSION_MINOR 1 +#define MBEDTLS_VERSION_MINOR 2 #define MBEDTLS_VERSION_PATCH 0 /** @@ -45,9 +45,9 @@ * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x03010000 -#define MBEDTLS_VERSION_STRING "3.1.0" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 3.1.0" +#define MBEDTLS_VERSION_NUMBER 0x03020000 +#define MBEDTLS_VERSION_STRING "3.2.0" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 3.2.0" #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) #define _CRT_SECURE_NO_DEPRECATE 1 diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index d08de59..d652157 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -274,7 +274,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.1.0 SOVERSION 11) + set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 3.2.0 SOVERSION 12) target_link_libraries(${mbedcrypto_target} PUBLIC ${libs}) if(TARGET everest) @@ -282,11 +282,11 @@ if(USE_SHARED_MBEDTLS_LIBRARY) endif() add_library(${mbedx509_target} SHARED ${src_x509}) - set_target_properties(${mbedx509_target} PROPERTIES VERSION 3.1.0 SOVERSION 4) + set_target_properties(${mbedx509_target} PROPERTIES VERSION 3.2.0 SOVERSION 4) target_link_libraries(${mbedx509_target} PUBLIC ${libs} ${mbedcrypto_target}) add_library(${mbedtls_target} SHARED ${src_tls}) - set_target_properties(${mbedtls_target} PROPERTIES VERSION 3.1.0 SOVERSION 17) + set_target_properties(${mbedtls_target} PROPERTIES VERSION 3.2.0 SOVERSION 18) target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target}) endif(USE_SHARED_MBEDTLS_LIBRARY) diff --git a/library/Makefile b/library/Makefile index d267e05..f5ff474 100644 --- a/library/Makefile +++ b/library/Makefile @@ -47,9 +47,9 @@ LOCAL_CFLAGS += -fPIC -fpic endif endif -SOEXT_TLS=so.17 +SOEXT_TLS=so.18 SOEXT_X509=so.4 -SOEXT_CRYPTO=so.11 +SOEXT_CRYPTO=so.12 # 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 da12382..e4ffded 100644 --- a/tests/suites/test_suite_version.data +++ b/tests/suites/test_suite_version.data @@ -1,8 +1,8 @@ Check compile time library version -check_compiletime_version:"3.1.0" +check_compiletime_version:"3.2.0" Check runtime library version -check_runtime_version:"3.1.0" +check_runtime_version:"3.2.0" Check for MBEDTLS_VERSION_C check_feature:"MBEDTLS_VERSION_C":0 |