diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-05 16:12:23 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-05 16:12:50 +0100 |
| commit | e435bed84708edb0c14fb94529fba7665966324f (patch) | |
| tree | c4fa986295390d9362c9cfcf438a7dd803b44ecb /thirdparty/mbedtls/include | |
| parent | bd553d072b65fe5359ab76e64566ff316d35c62e (diff) | |
mbedtls: Update to upstream version 2.16.5
Fixes https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2020-02
Drop patch to disable VIA padlock since we no longer use libwebsockets,
so there's no conflict anymore.
Diffstat (limited to 'thirdparty/mbedtls/include')
| -rw-r--r-- | thirdparty/mbedtls/include/mbedtls/config.h | 4 | ||||
| -rw-r--r-- | thirdparty/mbedtls/include/mbedtls/version.h | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/thirdparty/mbedtls/include/mbedtls/config.h b/thirdparty/mbedtls/include/mbedtls/config.h index 8d9c31a504..834cced87f 100644 --- a/thirdparty/mbedtls/include/mbedtls/config.h +++ b/thirdparty/mbedtls/include/mbedtls/config.h @@ -2542,9 +2542,7 @@ * * This modules adds support for the VIA PadLock on x86. */ -// -- GODOT start -- -// #define MBEDTLS_PADLOCK_C -// -- GODOT end -- +#define MBEDTLS_PADLOCK_C /** * \def MBEDTLS_PEM_PARSE_C diff --git a/thirdparty/mbedtls/include/mbedtls/version.h b/thirdparty/mbedtls/include/mbedtls/version.h index aeffb16699..8e2ce03c32 100644 --- a/thirdparty/mbedtls/include/mbedtls/version.h +++ b/thirdparty/mbedtls/include/mbedtls/version.h @@ -40,16 +40,16 @@ */ #define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MINOR 16 -#define MBEDTLS_VERSION_PATCH 4 +#define MBEDTLS_VERSION_PATCH 5 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02100400 -#define MBEDTLS_VERSION_STRING "2.16.4" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.16.4" +#define MBEDTLS_VERSION_NUMBER 0x02100500 +#define MBEDTLS_VERSION_STRING "2.16.5" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.16.5" #if defined(MBEDTLS_VERSION_C) |