Skip to content

Commit

Permalink
Bump version to Mbed TLS 2.21.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yanesca committed Feb 19, 2020
1 parent 4d8c836 commit bc7c242
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion doxygen/mbedtls.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.20.0"
PROJECT_NAME = "mbed TLS v2.21.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
Expand Down
8 changes: 4 additions & 4 deletions include/mbedtls/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
* Major, Minor, Patchlevel
*/
#define MBEDTLS_VERSION_MAJOR 2
#define MBEDTLS_VERSION_MINOR 20
#define MBEDTLS_VERSION_MINOR 21
#define MBEDTLS_VERSION_PATCH 0

/**
* The single version number has the following structure:
* MMNNPP00
* Major version | Minor version | Patch version
*/
#define MBEDTLS_VERSION_NUMBER 0x02140000
#define MBEDTLS_VERSION_STRING "2.20.0"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.20.0"
#define MBEDTLS_VERSION_NUMBER 0x02150000
#define MBEDTLS_VERSION_STRING "2.21.0"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.21.0"

#if defined(MBEDTLS_VERSION_C)

Expand Down
2 changes: 1 addition & 1 deletion library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)

if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedcrypto SHARED ${src_crypto})
set_target_properties(mbedcrypto PROPERTIES VERSION 2.20.0 SOVERSION 4)
set_target_properties(mbedcrypto PROPERTIES VERSION 2.21.0 SOVERSION 4)
target_link_libraries(mbedcrypto ${libs})
target_include_directories(mbedcrypto
PUBLIC ${MBEDTLS_DIR}/include/
Expand Down
4 changes: 2 additions & 2 deletions tests/suites/test_suite_version.data
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Check compiletime library version
check_compiletime_version:"2.20.0"
check_compiletime_version:"2.21.0"

Check runtime library version
check_runtime_version:"2.20.0"
check_runtime_version:"2.21.0"

Check for MBEDTLS_VERSION_C
check_feature:"MBEDTLS_VERSION_C":0
Expand Down

0 comments on commit bc7c242

Please sign in to comment.