Skip to content

Commit 1146b4e

Browse files
authored
Merge pull request #348 from yanesca/bump-version-to-mbed-tls-2.20.0
Bump version to Mbed TLS 2.20.0 and crypto SO version to 4
2 parents d27a884 + 2e9f108 commit 1146b4e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

doxygen/mbedtls.doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8
2828
# identify the project. Note that if you do not use Doxywizard you need
2929
# to put quotes around the project name if it contains spaces.
3030

31-
PROJECT_NAME = "mbed TLS v2.19.1"
31+
PROJECT_NAME = "mbed TLS v2.20.0"
3232

3333
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
3434
# This could be handy for archiving the generated documentation or

include/mbedtls/version.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
* Major, Minor, Patchlevel
4040
*/
4141
#define MBEDTLS_VERSION_MAJOR 2
42-
#define MBEDTLS_VERSION_MINOR 19
43-
#define MBEDTLS_VERSION_PATCH 1
42+
#define MBEDTLS_VERSION_MINOR 20
43+
#define MBEDTLS_VERSION_PATCH 0
4444

4545
/**
4646
* The single version number has the following structure:
4747
* MMNNPP00
4848
* Major version | Minor version | Patch version
4949
*/
50-
#define MBEDTLS_VERSION_NUMBER 0x02130100
51-
#define MBEDTLS_VERSION_STRING "2.19.1"
52-
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.19.1"
50+
#define MBEDTLS_VERSION_NUMBER 0x02140000
51+
#define MBEDTLS_VERSION_STRING "2.20.0"
52+
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.20.0"
5353

5454
#if defined(MBEDTLS_VERSION_C)
5555

library/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
157157

158158
if(USE_SHARED_MBEDTLS_LIBRARY)
159159
add_library(mbedcrypto SHARED ${src_crypto})
160-
set_target_properties(mbedcrypto PROPERTIES VERSION 2.17.0 SOVERSION 3)
160+
set_target_properties(mbedcrypto PROPERTIES VERSION 2.20.0 SOVERSION 4)
161161
target_link_libraries(mbedcrypto ${libs})
162162
target_include_directories(mbedcrypto
163163
PUBLIC ${MBEDTLS_DIR}/include/

library/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ LOCAL_CFLAGS += -fPIC -fpic
3636
endif
3737
endif
3838

39-
SOEXT_CRYPTO=so.3
39+
SOEXT_CRYPTO=so.4
4040

4141
# Set AR_DASH= (empty string) to use an ar implementation that does not accept
4242
# the - prefix for command line options (e.g. llvm-ar)

tests/suites/test_suite_version.data

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Check compiletime library version
2-
check_compiletime_version:"2.19.1"
2+
check_compiletime_version:"2.20.0"
33

44
Check runtime library version
5-
check_runtime_version:"2.19.1"
5+
check_runtime_version:"2.20.0"
66

77
Check for MBEDTLS_VERSION_C
88
check_feature:"MBEDTLS_VERSION_C":0

0 commit comments

Comments
 (0)