mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 00:05:35 +00:00
Merge pull request #546 from ARMmbed/version-2.1.18
Update the version of the library to 2.1.18
This commit is contained in:
commit
8adb617718
|
@ -1,6 +1,6 @@
|
|||
mbed TLS ChangeLog (Sorted per branch, date)
|
||||
|
||||
= mbed TLS 2.1.xx branch released xxxx-xx-xx
|
||||
= mbed TLS 2.1.18 branch released 2018-12-21
|
||||
|
||||
Bugfix
|
||||
* Fix for Clang, which was reporting a warning for the bignum.c inline
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @mainpage mbed TLS v2.1.17 source code documentation
|
||||
* @mainpage mbed TLS v2.1.18 source code documentation
|
||||
*
|
||||
* This documentation describes the internal structure of mbed TLS. It was
|
||||
* automatically generated from specially formatted comment blocks in
|
||||
|
|
|
@ -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.17"
|
||||
PROJECT_NAME = "mbed TLS v2.1.18"
|
||||
|
||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
|
||||
# This could be handy for archiving the generated documentation or
|
||||
|
|
|
@ -39,16 +39,16 @@
|
|||
*/
|
||||
#define MBEDTLS_VERSION_MAJOR 2
|
||||
#define MBEDTLS_VERSION_MINOR 1
|
||||
#define MBEDTLS_VERSION_PATCH 17
|
||||
#define MBEDTLS_VERSION_PATCH 18
|
||||
|
||||
/**
|
||||
* The single version number has the following structure:
|
||||
* MMNNPP00
|
||||
* Major version | Minor version | Patch version
|
||||
*/
|
||||
#define MBEDTLS_VERSION_NUMBER 0x02011100
|
||||
#define MBEDTLS_VERSION_STRING "2.1.17"
|
||||
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.17"
|
||||
#define MBEDTLS_VERSION_NUMBER 0x02011200
|
||||
#define MBEDTLS_VERSION_STRING "2.1.18"
|
||||
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.18"
|
||||
|
||||
#if defined(MBEDTLS_VERSION_C)
|
||||
|
||||
|
|
|
@ -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.17 SOVERSION 0)
|
||||
set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.18 SOVERSION 0)
|
||||
target_link_libraries(mbedcrypto ${libs})
|
||||
|
||||
add_library(mbedx509 SHARED ${src_x509})
|
||||
set_target_properties(mbedx509 PROPERTIES VERSION 2.1.17 SOVERSION 0)
|
||||
set_target_properties(mbedx509 PROPERTIES VERSION 2.1.18 SOVERSION 0)
|
||||
target_link_libraries(mbedx509 ${libs} mbedcrypto)
|
||||
|
||||
add_library(mbedtls SHARED ${src_tls})
|
||||
set_target_properties(mbedtls PROPERTIES VERSION 2.1.17 SOVERSION 10)
|
||||
set_target_properties(mbedtls PROPERTIES VERSION 2.1.18 SOVERSION 10)
|
||||
target_link_libraries(mbedtls ${libs} mbedx509)
|
||||
|
||||
install(TARGETS mbedtls mbedx509 mbedcrypto
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Check compiletime library version
|
||||
check_compiletime_version:"2.1.17"
|
||||
check_compiletime_version:"2.1.18"
|
||||
|
||||
Check runtime library version
|
||||
check_runtime_version:"2.1.17"
|
||||
check_runtime_version:"2.1.18"
|
||||
|
||||
Check for MBEDTLS_VERSION_C
|
||||
check_feature:"MBEDTLS_VERSION_C":0
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "mbedtls",
|
||||
"version": "2.1.17",
|
||||
"version": "2.1.18",
|
||||
"description": "The mbed TLS crypto/SSL/TLS library",
|
||||
"licenses": [
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue