Skip to content

Commit eb00fba

Browse files
committed
tls: Update to Mbed TLS 2.19.1
Update Mbed TLS to Mbed TLS 2.19.1.
1 parent 60f383e commit eb00fba

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
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.19.0
1+
mbedtls-2.19.1

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.19.0
30+
MBED_TLS_RELEASE ?= mbedtls-2.19.1
3131
MBED_TLS_REPO_URL ?= [email protected]:ARMmbed/mbedtls-restricted.git
3232

3333
# Translate between mbed TLS namespace and mbed namespace

features/mbedtls/inc/mbedtls/check_config.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,14 @@
305305
#error "MBEDTLS_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites"
306306
#endif
307307

308+
#if defined(MBEDTLS_MEMORY_BACKTRACE) && !defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
309+
#error "MBEDTLS_MEMORY_BACKTRACE defined, but not all prerequesites"
310+
#endif
311+
312+
#if defined(MBEDTLS_MEMORY_DEBUG) && !defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
313+
#error "MBEDTLS_MEMORY_DEBUG defined, but not all prerequesites"
314+
#endif
315+
308316
#if defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_HAVE_ASM)
309317
#error "MBEDTLS_PADLOCK_C defined, but not all prerequisites"
310318
#endif

features/mbedtls/inc/mbedtls/ssl.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,8 @@ struct mbedtls_ssl_config
970970
* tls_prf and random bytes. Should replace f_export_keys */
971971
int (*f_export_keys_ext)( void *, const unsigned char *,
972972
const unsigned char *, size_t, size_t, size_t,
973-
unsigned char[32], unsigned char[32], mbedtls_tls_prf_types );
973+
const unsigned char[32], const unsigned char[32],
974+
mbedtls_tls_prf_types );
974975
void *p_export_keys; /*!< context for key export callback */
975976
#endif
976977

@@ -1925,8 +1926,8 @@ typedef int mbedtls_ssl_export_keys_ext_t( void *p_expkey,
19251926
size_t maclen,
19261927
size_t keylen,
19271928
size_t ivlen,
1928-
unsigned char client_random[32],
1929-
unsigned char server_random[32],
1929+
const unsigned char client_random[32],
1930+
const unsigned char server_random[32],
19301931
mbedtls_tls_prf_types tls_prf_type );
19311932
#endif /* MBEDTLS_SSL_EXPORT_KEYS */
19321933

features/mbedtls/src/ssl_tls.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,9 +1427,8 @@ static int ssl_populate_transform( mbedtls_ssl_transform *transform,
14271427
master, keyblk,
14281428
mac_key_len, keylen,
14291429
iv_copy_len,
1430-
/* work around bug in exporter type */
1431-
(unsigned char *) randbytes + 32,
1432-
(unsigned char *) randbytes,
1430+
randbytes + 32,
1431+
randbytes,
14331432
tls_prf_get_type( tls_prf ) );
14341433
}
14351434
#endif

0 commit comments

Comments
 (0)