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

Merge remote-tracking branch 'origin/pr/2688' into mbedtls-2.7

Browse Source 
* origin/pr/2688:
  Update library version to 2.7.11
This commit is contained in:
Jaeden Amero 2019-06-18 14:22:59 +01:00
commit 35a7e4675f
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,6 @@
mbed TLS ChangeLog (Sorted per branch, date) mbed TLS ChangeLog (Sorted per branch, date)
= mbed TLS 2.7.x branch released xxxx-xx-xx = mbed TLS 2.7.11 branch released 2019-06-11
Security Security
* Make mbedtls_ecdh_get_params return an error if the second key * Make mbedtls_ecdh_get_params return an error if the second key

2
doxygen/input/doc_mainpage.h
View File

@ -24,7 +24,7 @@
*/ */
/** /**
* @mainpage mbed TLS v2.7.10 source code documentation * @mainpage mbed TLS v2.7.11 source code documentation
* *
* This documentation describes the internal structure of mbed TLS. It was * This documentation describes the internal structure of mbed TLS. It was
* automatically generated from specially formatted comment blocks in * 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 # identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces. # to put quotes around the project name if it contains spaces.
PROJECT_NAME = "mbed TLS v2.7.10" PROJECT_NAME = "mbed TLS v2.7.11"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. # The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or

8
include/mbedtls/version.h
View File

@ -40,16 +40,16 @@
*/ */
#define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MAJOR 2
#define MBEDTLS_VERSION_MINOR 7 #define MBEDTLS_VERSION_MINOR 7
#define MBEDTLS_VERSION_PATCH 10 #define MBEDTLS_VERSION_PATCH 11
/** /**
* The single version number has the following structure: * The single version number has the following structure:
* MMNNPP00 * MMNNPP00
* Major version | Minor version | Patch version * Major version | Minor version | Patch version
*/ */
#define MBEDTLS_VERSION_NUMBER 0x02070A00 #define MBEDTLS_VERSION_NUMBER 0x02070B00
#define MBEDTLS_VERSION_STRING "2.7.10" #define MBEDTLS_VERSION_STRING "2.7.11"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.10" #define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.11"
#if defined(MBEDTLS_VERSION_C) #if defined(MBEDTLS_VERSION_C)

6
library/CMakeLists.txt
View File

@ -147,15 +147,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedcrypto SHARED ${src_crypto}) add_library(mbedcrypto SHARED ${src_crypto})
set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.10 SOVERSION 2) set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.11 SOVERSION 2)
target_link_libraries(mbedcrypto ${libs}) target_link_libraries(mbedcrypto ${libs})
add_library(mbedx509 SHARED ${src_x509}) add_library(mbedx509 SHARED ${src_x509})
set_target_properties(mbedx509 PROPERTIES VERSION 2.7.10 SOVERSION 0) set_target_properties(mbedx509 PROPERTIES VERSION 2.7.11 SOVERSION 0)
target_link_libraries(mbedx509 ${libs} mbedcrypto) target_link_libraries(mbedx509 ${libs} mbedcrypto)
add_library(mbedtls SHARED ${src_tls}) add_library(mbedtls SHARED ${src_tls})
set_target_properties(mbedtls PROPERTIES VERSION 2.7.10 SOVERSION 10) set_target_properties(mbedtls PROPERTIES VERSION 2.7.11 SOVERSION 10)
target_link_libraries(mbedtls ${libs} mbedx509) target_link_libraries(mbedtls ${libs} mbedx509)
install(TARGETS mbedtls mbedx509 mbedcrypto install(TARGETS mbedtls mbedx509 mbedcrypto

4
tests/suites/test_suite_version.data
View File

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