Skip to content

Commit 948d437

Browse files
k-stachowiakPatater
authored andcommitted
Update Mbed TLS feature to 2.18.0-rc2
1 parent 303d0f0 commit 948d437

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-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.18.0-rc1
1+
mbedtls-2.18.0-rc2

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.18.0-rc1
30+
MBED_TLS_RELEASE ?= mbedtls-2.18.0-rc2
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/ssl.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,13 +2820,19 @@ void mbedtls_ssl_conf_cert_req_ca_list( mbedtls_ssl_config *conf,
28202820

28212821
#if defined(MBEDTLS_SSL_MAX_FRAGMENT_LENGTH)
28222822
/**
2823-
* \brief Set the maximum fragment length to emit and/or negotiate
2824-
* (Default: the smaller of MBEDTLS_SSL_IN_CONTENT_LEN and
2825-
* MBEDTLS_SSL_OUT_CONTENT_LEN, usually 2^14 bytes)
2823+
* \brief Set the maximum fragment length to emit and/or negotiate.
2824+
* (Typical: the smaller of #MBEDTLS_SSL_IN_CONTENT_LEN and
2825+
* #MBEDTLS_SSL_OUT_CONTENT_LEN, usually `2^14` bytes)
28262826
* (Server: set maximum fragment length to emit,
2827-
* usually negotiated by the client during handshake
2827+
* usually negotiated by the client during handshake)
28282828
* (Client: set maximum fragment length to emit *and*
28292829
* negotiate with the server during handshake)
2830+
* (Default: #MBEDTLS_SSL_MAX_FRAG_LEN_NONE)
2831+
*
2832+
* \note On the client side, the maximum fragment length extension
2833+
* *will not* be used, unless the maximum fragment length has
2834+
* been set via this function to a value different than
2835+
* #MBEDTLS_SSL_MAX_FRAG_LEN_NONE.
28302836
*
28312837
* \note With TLS, this currently only affects ApplicationData (sent
28322838
* with \c mbedtls_ssl_read()), not handshake messages.

features/mbedtls/src/x509_crt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ static int x509_get_subject_alt_name( unsigned char **p,
681681
sizeof( mbedtls_x509_sequence ) );
682682
mbedtls_free( seq_prv );
683683
}
684+
subject_alt_name->next = NULL;
684685
return( ret );
685686
}
686687

0 commit comments

Comments
 (0)