Merge remote-tracking branch 'restricted/pr/500' into mbedtls-2.7-restricted

simonbutcher · simonbutcher · commit 5ef42fd415a1 · 2018-07-26T14:33:14.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,6 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
-= mbed TLS x.x.x branch released xxxx-xx-xx
+= mbed TLS 2.7.5 branch released 2018-07-25
 
 Security
    * Fix a vulnerability in TLS ciphersuites based on CBC and using SHA-384,
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
@@ -24,7 +24,7 @@
  */
 
 /**
- * @mainpage mbed TLS v2.7.4 source code documentation
+ * @mainpage mbed TLS v2.7.5 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
@@ -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.7.4"
+PROJECT_NAME           = "mbed TLS v2.7.5"
 
 # 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
@@ -40,16 +40,16 @@
  */
 #define MBEDTLS_VERSION_MAJOR  2
 #define MBEDTLS_VERSION_MINOR  7
-#define MBEDTLS_VERSION_PATCH  4
+#define MBEDTLS_VERSION_PATCH  5
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define MBEDTLS_VERSION_NUMBER         0x02070400
-#define MBEDTLS_VERSION_STRING         "2.7.4"
-#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.7.4"
+#define MBEDTLS_VERSION_NUMBER         0x02070500
+#define MBEDTLS_VERSION_STRING         "2.7.5"
+#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.7.5"
 
 #if defined(MBEDTLS_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -141,15 +141,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
 
 if(USE_SHARED_MBEDTLS_LIBRARY)
     add_library(mbedcrypto SHARED ${src_crypto})
-    set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.4 SOVERSION 2)
+    set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.5 SOVERSION 2)
     target_link_libraries(mbedcrypto ${libs})
 
     add_library(mbedx509 SHARED ${src_x509})
-    set_target_properties(mbedx509 PROPERTIES VERSION 2.7.4 SOVERSION 0)
+    set_target_properties(mbedx509 PROPERTIES VERSION 2.7.5 SOVERSION 0)
     target_link_libraries(mbedx509 ${libs} mbedcrypto)
 
     add_library(mbedtls SHARED ${src_tls})
-    set_target_properties(mbedtls PROPERTIES VERSION 2.7.4 SOVERSION 10)
+    set_target_properties(mbedtls PROPERTIES VERSION 2.7.5 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
@@ -1,8 +1,8 @@
 Check compiletime library version
-check_compiletime_version:"2.7.4"
+check_compiletime_version:"2.7.5"
 
 Check runtime library version
-check_runtime_version:"2.7.4"
+check_runtime_version:"2.7.5"
 
 Check for MBEDTLS_VERSION_C
 check_feature:"MBEDTLS_VERSION_C":0

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * @mainpage mbed TLS v2.7.4 source code documentation`
	`27`	`+ * @mainpage mbed TLS v2.7.5 source code documentation`
`28`	`28`	`*`
`29`	`29`	`* This documentation describes the internal structure of mbed TLS. It was`
`30`	`30`	`* automatically generated from specially formatted comment blocks in`