Skip to content

Commit 1a6028b

Browse files
Krzysztof Stachowiakadbridge
authored andcommitted
Update MbedTLS to 2.10.0 (from an RC)
1 parent 1394b03 commit 1a6028b

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

features/mbedtls/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mbedtls-2.10.0-rc1
1+
mbedtls-2.10.0

features/mbedtls/importer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#
2828

2929
# Set the mbed TLS release to import (this can/should be edited before import)
30-
MBED_TLS_RELEASE ?= mbedtls-2.10.0-rc1
30+
MBED_TLS_RELEASE ?= mbedtls-2.10.0
3131

3232
# Translate between mbed TLS namespace and mbed namespace
3333
TARGET_PREFIX:=../

features/mbedtls/inc/mbedtls/config-no-entropy.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
#define MBEDTLS_X509_USE_C
8383
#define MBEDTLS_X509_CRT_PARSE_C
8484
#define MBEDTLS_X509_CRL_PARSE_C
85+
//#define MBEDTLS_CMAC_C
8586

8687
/* Miscellaneous options */
8788
#define MBEDTLS_AES_ROM_TABLES

features/mbedtls/inc/mbedtls/version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
* Major, Minor, Patchlevel
4040
*/
4141
#define MBEDTLS_VERSION_MAJOR 2
42-
#define MBEDTLS_VERSION_MINOR 9
42+
#define MBEDTLS_VERSION_MINOR 10
4343
#define MBEDTLS_VERSION_PATCH 0
4444

4545
/**
4646
* The single version number has the following structure:
4747
* MMNNPP00
4848
* Major version | Minor version | Patch version
4949
*/
50-
#define MBEDTLS_VERSION_NUMBER 0x02090000
51-
#define MBEDTLS_VERSION_STRING "2.9.0"
52-
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.9.0"
50+
#define MBEDTLS_VERSION_NUMBER 0x020A0000
51+
#define MBEDTLS_VERSION_STRING "2.10.0"
52+
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.10.0"
5353

5454
#if defined(MBEDTLS_VERSION_C)
5555

0 commit comments

Comments
 (0)