diff options
author | Jaeden Amero <jaeden.amero@arm.com> | 2018-02-05 11:39:08 +0000 |
---|---|---|
committer | Jaeden Amero <jaeden.amero@arm.com> | 2018-02-05 11:39:08 +0000 |
commit | 40334b814c8736a49530b7065844a7bdca3530bd (patch) | |
tree | 5a224cc7679162eb74f4a5cb0d897f9c05e3bc85 | |
parent | 2774c6746c051633080d1a8be3360d71a58388d2 (diff) | |
parent | ea02d70e32e7770ae97aafcafdd64294e43347a0 (diff) | |
download | mbed-tls-mbedtls-1.3.tar.gz |
Merge remote-tracking branch 'upstream-restricted/pr/450' into mbedtls-1.3-restrictedmbedtls-1.3.22mbedtls-1.3archive/mbedtls-1.3
-rw-r--r-- | doxygen/input/doc_mainpage.h | 2 | ||||
-rw-r--r-- | doxygen/mbedtls.doxyfile | 2 | ||||
-rw-r--r-- | include/polarssl/version.h | 8 | ||||
-rw-r--r-- | library/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/suites/test_suite_version.data | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index 3452e24fa..2a30ee6fe 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage mbed TLS v1.3.21 source code documentation + * @mainpage mbed TLS v1.3.22 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 9b00327ca..4d094baa4 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 v1.3.21" +PROJECT_NAME = "mbed TLS v1.3.22" # 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/include/polarssl/version.h b/include/polarssl/version.h index eb66062a5..0d1697acc 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -40,16 +40,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 3 -#define POLARSSL_VERSION_PATCH 21 +#define POLARSSL_VERSION_PATCH 22 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01031500 -#define POLARSSL_VERSION_STRING "1.3.21" -#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.21" +#define POLARSSL_VERSION_NUMBER 0x01031600 +#define POLARSSL_VERSION_STRING "1.3.22" +#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.22" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 7e521ae10..0aa044425 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -117,7 +117,7 @@ endif() if(USE_SHARED_MBEDTLS_LIBRARY) add_library(mbedtls SHARED ${src}) - set_target_properties(mbedtls PROPERTIES VERSION 1.3.21 SOVERSION 9) + set_target_properties(mbedtls PROPERTIES VERSION 1.3.22 SOVERSION 9) target_link_libraries(mbedtls ${libs}) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 42c4abbe1..7a5b9d0c1 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:"1.3.21" +check_compiletime_version:"1.3.22" Check runtime library version -check_runtime_version:"1.3.21" +check_runtime_version:"1.3.22" Check for POLARSSL_VERSION_C check_feature:"POLARSSL_VERSION_C":0 |