yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-23 00:45:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-restricted/pr/449' into mbedtls-2.1-restricted

Browse Source
This commit is contained in:
Jaeden Amero 2018-02-05 11:38:32 +00:00
commit 4c53d0dcb2
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doxygen/input/doc_mainpage.h
View File

@ -21,7 +21,7 @@
*/
/**
* @mainpage mbed TLS v2.1.9 source code documentation
* @mainpage mbed TLS v2.1.10 source code documentation
*
* This documentation describes the internal structure of mbed TLS. It was
* automatically generated from specially formatted comment blocks in

2
doxygen/mbedtls.doxyfile
View File

@ -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.9"
PROJECT_NAME = "mbed TLS v2.1.10"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or

8
include/mbedtls/version.h
View File

@ -39,16 +39,16 @@
*/
#define MBEDTLS_VERSION_MAJOR 2
#define MBEDTLS_VERSION_MINOR 1
#define MBEDTLS_VERSION_PATCH 9
#define MBEDTLS_VERSION_PATCH 10
/**
* The single version number has the following structure:
* MMNNPP00
* Major version | Minor version | Patch version
*/
#define MBEDTLS_VERSION_NUMBER 0x02010900
#define MBEDTLS_VERSION_STRING "2.1.9"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.9"
#define MBEDTLS_VERSION_NUMBER 0x02010A00
#define MBEDTLS_VERSION_STRING "2.1.10"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.10"
#if defined(MBEDTLS_VERSION_C)

6
library/CMakeLists.txt
View File

@ -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.9 SOVERSION 0)
set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.10 SOVERSION 0)
target_link_libraries(mbedcrypto ${libs})
add_library(mbedx509 SHARED ${src_x509})
set_target_properties(mbedx509 PROPERTIES VERSION 2.1.9 SOVERSION 0)
set_target_properties(mbedx509 PROPERTIES VERSION 2.1.10 SOVERSION 0)
target_link_libraries(mbedx509 ${libs} mbedcrypto)
add_library(mbedtls SHARED ${src_tls})
set_target_properties(mbedtls PROPERTIES VERSION 2.1.9 SOVERSION 10)
set_target_properties(mbedtls PROPERTIES VERSION 2.1.10 SOVERSION 10)
target_link_libraries(mbedtls ${libs} mbedx509)
install(TARGETS mbedtls mbedx509 mbedcrypto

4
tests/suites/test_suite_version.data
View File

@ -1,8 +1,8 @@
Check compiletime library version
check_compiletime_version:"2.1.9"
check_compiletime_version:"2.1.10"
Check runtime library version
check_runtime_version:"2.1.9"
check_runtime_version:"2.1.10"
Check for MBEDTLS_VERSION_C
check_feature:"MBEDTLS_VERSION_C":0

2
yotta/data/module.json
View File

@ -1,6 +1,6 @@
{
"name": "mbedtls",
"version": "2.1.9",
"version": "2.1.10",
"description": "The mbed TLS crypto/SSL/TLS library",
"licenses": [
{