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

Merge remote-tracking branch 'upstream-restricted/pr/450' into mbedtls-1.3-restricted

Browse Source
This commit is contained in:
Jaeden Amero 2018-02-05 11:39:08 +00:00
commit 40334b814c
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doxygen/input/doc_mainpage.h
View File

@ -4,7 +4,7 @@
*/ */
/** /**
* @mainpage mbed TLS v1.3.21 source code documentation * @mainpage mbed TLS v1.3.22 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 v1.3.21" PROJECT_NAME = "mbed TLS v1.3.22"
# 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/polarssl/version.h
View File

@ -40,16 +40,16 @@
*/ */
#define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MAJOR 1
#define POLARSSL_VERSION_MINOR 3 #define POLARSSL_VERSION_MINOR 3
#define POLARSSL_VERSION_PATCH 21 #define POLARSSL_VERSION_PATCH 22
/** /**
* 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 POLARSSL_VERSION_NUMBER 0x01031500 #define POLARSSL_VERSION_NUMBER 0x01031600
#define POLARSSL_VERSION_STRING "1.3.21" #define POLARSSL_VERSION_STRING "1.3.22"
#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.21" #define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.22"
#if defined(POLARSSL_VERSION_C) #if defined(POLARSSL_VERSION_C)

2
library/CMakeLists.txt
View File

@ -117,7 +117,7 @@ endif()
if(USE_SHARED_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedtls SHARED ${src}) add_library(mbedtls SHARED ${src})
set_target_properties(mbedtls PROPERTIES VERSION 1.3.21 SOVERSION 9) set_target_properties(mbedtls PROPERTIES VERSION 1.3.22 SOVERSION 9)
target_link_libraries(mbedtls ${libs}) target_link_libraries(mbedtls ${libs})

4
tests/suites/test_suite_version.data
View File

@ -1,8 +1,8 @@
Check compiletime library version Check compiletime library version
check_compiletime_version:"1.3.21" check_compiletime_version:"1.3.22"
Check runtime library version Check runtime library version
check_runtime_version:"1.3.21" check_runtime_version:"1.3.22"
Check for POLARSSL_VERSION_C Check for POLARSSL_VERSION_C
check_feature:"POLARSSL_VERSION_C":0 check_feature:"POLARSSL_VERSION_C":0