yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2993 from yanesca/bump-version-2.20.0

Browse source 
Bump version to Mbed TLS 2.20.0
This commit is contained in:
Janos Follath 2020-01-28 11:31:57 +00:00 committed by GitHub
commit 4c987e2c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crypto

@ -1 +1 @@
Subproject commit d27a88438fe785f0906c01e3216044d1c98be875 Subproject commit 1146b4e06011b69a6437e6b728f2af043a06ec19

2
doxygen/input/doc_mainpage.h
View file

@ -24,7 +24,7 @@
*/ */
/** /**
* @mainpage mbed TLS v2.19.1 source code documentation * @mainpage mbed TLS v2.20.0 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.19.1" PROJECT_NAME = "mbed TLS v2.20.0"
# 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

10
include/mbedtls/version.h
View file

@ -39,17 +39,17 @@
* Major, Minor, Patchlevel * Major, Minor, Patchlevel
*/ */
#define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MAJOR 2
#define MBEDTLS_VERSION_MINOR 19 #define MBEDTLS_VERSION_MINOR 20
#define MBEDTLS_VERSION_PATCH 1 #define MBEDTLS_VERSION_PATCH 0
/** /**
* 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 0x02130100 #define MBEDTLS_VERSION_NUMBER 0x02140000
#define MBEDTLS_VERSION_STRING "2.19.1" #define MBEDTLS_VERSION_STRING "2.20.0"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.19.1" #define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.20.0"
#if defined(MBEDTLS_VERSION_C) #if defined(MBEDTLS_VERSION_C)

4
library/CMakeLists.txt
View file

@ -174,14 +174,14 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedx509 SHARED ${src_x509}) add_library(mbedx509 SHARED ${src_x509})
set_target_properties(mbedx509 PROPERTIES VERSION 2.19.1 SOVERSION 1) set_target_properties(mbedx509 PROPERTIES VERSION 2.20.0 SOVERSION 1)
target_link_libraries(mbedx509 ${libs} mbedcrypto) target_link_libraries(mbedx509 ${libs} mbedcrypto)
target_include_directories(mbedx509 target_include_directories(mbedx509
PUBLIC ${MBEDTLS_DIR}/include/ PUBLIC ${MBEDTLS_DIR}/include/
PUBLIC ${MBEDTLS_DIR}/crypto/include/) PUBLIC ${MBEDTLS_DIR}/crypto/include/)
add_library(mbedtls SHARED ${src_tls}) add_library(mbedtls SHARED ${src_tls})
set_target_properties(mbedtls PROPERTIES VERSION 2.19.1 SOVERSION 13) set_target_properties(mbedtls PROPERTIES VERSION 2.20.0 SOVERSION 13)
target_link_libraries(mbedtls ${libs} mbedx509) target_link_libraries(mbedtls ${libs} mbedx509)
target_include_directories(mbedtls target_include_directories(mbedtls
PUBLIC ${MBEDTLS_DIR}/include/ PUBLIC ${MBEDTLS_DIR}/include/

2
library/Makefile
View file

@ -37,7 +37,7 @@ endif
SOEXT_TLS=so.13 SOEXT_TLS=so.13
SOEXT_X509=so.1 SOEXT_X509=so.1
SOEXT_CRYPTO=so.3 SOEXT_CRYPTO=so.4
# Set AR_DASH= (empty string) to use an ar implementation that does not accept # Set AR_DASH= (empty string) to use an ar implementation that does not accept
# the - prefix for command line options (e.g. llvm-ar) # the - prefix for command line options (e.g. llvm-ar)

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.19.1" check_compiletime_version:"2.20.0"
Check runtime library version Check runtime library version
check_runtime_version:"2.19.1" check_runtime_version:"2.20.0"
Check for MBEDTLS_VERSION_C Check for MBEDTLS_VERSION_C
check_feature:"MBEDTLS_VERSION_C":0 check_feature:"MBEDTLS_VERSION_C":0