aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Butcher <simon.butcher@arm.com>2018-12-21 12:21:30 +0000
committerGitHub <noreply@github.com>2018-12-21 12:21:30 +0000
commit8adb617718d3a4d27601f603080f78379e7e6506 (patch)
treea63019fb61fd78ac71927d7faefd6fcc13a55902
parent441c55d5dfa67a92900d6941118098251868a8ab (diff)
parentd913726856ebf4d89eac87949d0d5527cb02b231 (diff)
downloadmbed-tls-mbedtls-2.1.tar.gz
Merge pull request #546 from ARMmbed/version-2.1.18mbedtls-2.1.18mbedtls-2.1archive/mbedtls-2.1
Update the version of the library to 2.1.18
-rw-r--r--ChangeLog2
-rw-r--r--doxygen/input/doc_mainpage.h2
-rw-r--r--doxygen/mbedtls.doxyfile2
-rw-r--r--include/mbedtls/version.h8
-rw-r--r--library/CMakeLists.txt6
-rw-r--r--tests/suites/test_suite_version.data4
-rw-r--r--yotta/data/module.json2
7 files changed, 13 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d7330880..8b9b8c3ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
mbed TLS ChangeLog (Sorted per branch, date)
-= mbed TLS 2.1.xx branch released xxxx-xx-xx
+= mbed TLS 2.1.18 branch released 2018-12-21
Bugfix
* Fix for Clang, which was reporting a warning for the bignum.c inline
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 74ff30d8d..1261c6265 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -21,7 +21,7 @@
*/
/**
- * @mainpage mbed TLS v2.1.17 source code documentation
+ * @mainpage mbed TLS v2.1.18 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 630daf5cf..4dc87fbb4 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 v2.1.17"
+PROJECT_NAME = "mbed TLS v2.1.18"
# 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/mbedtls/version.h b/include/mbedtls/version.h
index ca95402e2..05a381d17 100644
--- a/include/mbedtls/version.h
+++ b/include/mbedtls/version.h
@@ -39,16 +39,16 @@
*/
#define MBEDTLS_VERSION_MAJOR 2
#define MBEDTLS_VERSION_MINOR 1
-#define MBEDTLS_VERSION_PATCH 17
+#define MBEDTLS_VERSION_PATCH 18
/**
* The single version number has the following structure:
* MMNNPP00
* Major version | Minor version | Patch version
*/
-#define MBEDTLS_VERSION_NUMBER 0x02011100
-#define MBEDTLS_VERSION_STRING "2.1.17"
-#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.17"
+#define MBEDTLS_VERSION_NUMBER 0x02011200
+#define MBEDTLS_VERSION_STRING "2.1.18"
+#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.18"
#if defined(MBEDTLS_VERSION_C)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 72713cc53..f7f034082 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -138,15 +138,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedcrypto SHARED ${src_crypto})
- set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.17 SOVERSION 0)
+ set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.18 SOVERSION 0)
target_link_libraries(mbedcrypto ${libs})
add_library(mbedx509 SHARED ${src_x509})
- set_target_properties(mbedx509 PROPERTIES VERSION 2.1.17 SOVERSION 0)
+ set_target_properties(mbedx509 PROPERTIES VERSION 2.1.18 SOVERSION 0)
target_link_libraries(mbedx509 ${libs} mbedcrypto)
add_library(mbedtls SHARED ${src_tls})
- set_target_properties(mbedtls PROPERTIES VERSION 2.1.17 SOVERSION 10)
+ set_target_properties(mbedtls PROPERTIES VERSION 2.1.18 SOVERSION 10)
target_link_libraries(mbedtls ${libs} mbedx509)
install(TARGETS mbedtls mbedx509 mbedcrypto
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 588eaf9a6..797040405 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:"2.1.17"
+check_compiletime_version:"2.1.18"
Check runtime library version
-check_runtime_version:"2.1.17"
+check_runtime_version:"2.1.18"
Check for MBEDTLS_VERSION_C
check_feature:"MBEDTLS_VERSION_C":0
diff --git a/yotta/data/module.json b/yotta/data/module.json
index 09392061e..a7f68cdbc 100644
--- a/yotta/data/module.json
+++ b/yotta/data/module.json
@@ -1,6 +1,6 @@
{
"name": "mbedtls",
- "version": "2.1.17",
+ "version": "2.1.18",
"description": "The mbed TLS crypto/SSL/TLS library",
"licenses": [
{