Skip to content

Commit 85a5bbc

Browse files
authored
Merge pull request #542 from ARMmbed/version-2.1.17
Update the library version to 2.1.17
2 parents 4b6ef83 + 67301e8 commit 85a5bbc

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

ChangeLog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mbed TLS ChangeLog (Sorted per branch, date)
22

3-
= mbed TLS 2.1.x branch released xxxx-xx-xx
3+
= mbed TLS 2.1.17 branch released 2018-11-30
44

55
Security
66
* Fix timing variations and memory access variations in RSA PKCS#1 v1.5

doxygen/input/doc_mainpage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222

2323
/**
24-
* @mainpage mbed TLS v2.1.16 source code documentation
24+
* @mainpage mbed TLS v2.1.17 source code documentation
2525
*
2626
* This documentation describes the internal structure of mbed TLS. It was
2727
* automatically generated from specially formatted comment blocks in

doxygen/mbedtls.doxyfile

+1-1
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.1.16"
31+
PROJECT_NAME = "mbed TLS v2.1.17"
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
*/
4040
#define MBEDTLS_VERSION_MAJOR 2
4141
#define MBEDTLS_VERSION_MINOR 1
42-
#define MBEDTLS_VERSION_PATCH 16
42+
#define MBEDTLS_VERSION_PATCH 17
4343

4444
/**
4545
* The single version number has the following structure:
4646
* MMNNPP00
4747
* Major version | Minor version | Patch version
4848
*/
49-
#define MBEDTLS_VERSION_NUMBER 0x02011000
50-
#define MBEDTLS_VERSION_STRING "2.1.16"
51-
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.16"
49+
#define MBEDTLS_VERSION_NUMBER 0x02011100
50+
#define MBEDTLS_VERSION_STRING "2.1.17"
51+
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.17"
5252

5353
#if defined(MBEDTLS_VERSION_C)
5454

library/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
138138

139139
if(USE_SHARED_MBEDTLS_LIBRARY)
140140
add_library(mbedcrypto SHARED ${src_crypto})
141-
set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.16 SOVERSION 0)
141+
set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.17 SOVERSION 0)
142142
target_link_libraries(mbedcrypto ${libs})
143143

144144
add_library(mbedx509 SHARED ${src_x509})
145-
set_target_properties(mbedx509 PROPERTIES VERSION 2.1.16 SOVERSION 0)
145+
set_target_properties(mbedx509 PROPERTIES VERSION 2.1.17 SOVERSION 0)
146146
target_link_libraries(mbedx509 ${libs} mbedcrypto)
147147

148148
add_library(mbedtls SHARED ${src_tls})
149-
set_target_properties(mbedtls PROPERTIES VERSION 2.1.16 SOVERSION 10)
149+
set_target_properties(mbedtls PROPERTIES VERSION 2.1.17 SOVERSION 10)
150150
target_link_libraries(mbedtls ${libs} mbedx509)
151151

152152
install(TARGETS mbedtls mbedx509 mbedcrypto

tests/suites/test_suite_version.data

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Check compiletime library version
2-
check_compiletime_version:"2.1.16"
2+
check_compiletime_version:"2.1.17"
33

44
Check runtime library version
5-
check_runtime_version:"2.1.16"
5+
check_runtime_version:"2.1.17"
66

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

yotta/data/module.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mbedtls",
3-
"version": "2.1.16",
3+
"version": "2.1.17",
44
"description": "The mbed TLS crypto/SSL/TLS library",
55
"licenses": [
66
{

0 commit comments

Comments
 (0)