mirror of
				https://github.com/Mbed-TLS/mbedtls.git
				synced 2025-11-03 20:33:16 +03:00 
			
		
		
		
	Merge remote-tracking branch 'origin/pr/2611' into mbedtls-2.16
* origin/pr/2611: Update change log Reword ssl_conf_max_frag_len documentation for clarity
This commit is contained in:
		@@ -46,6 +46,8 @@ Changes
 | 
			
		||||
     Found by Coverity, reported and fixed by Peter Kolbus (Garmin). Fixes #2309.
 | 
			
		||||
   * Add test for minimal value of MBEDTLS_MPI_WINDOW_SIZE to all.sh.
 | 
			
		||||
     Contributed by Peter Kolbus (Garmin).
 | 
			
		||||
   * Change wording in the `mbedtls_ssl_conf_max_frag_len()`'s documentation to
 | 
			
		||||
     improve clarity. Fixes #2258.
 | 
			
		||||
 | 
			
		||||
= mbed TLS 2.16.1 branch released 2019-03-19
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2532,22 +2532,28 @@ void mbedtls_ssl_conf_cert_req_ca_list( mbedtls_ssl_config *conf,
 | 
			
		||||
 | 
			
		||||
#if defined(MBEDTLS_SSL_MAX_FRAGMENT_LENGTH)
 | 
			
		||||
/**
 | 
			
		||||
 * \brief          Set the maximum fragment length to emit and/or negotiate
 | 
			
		||||
 *                 (Default: the smaller of MBEDTLS_SSL_IN_CONTENT_LEN and
 | 
			
		||||
 *                 MBEDTLS_SSL_OUT_CONTENT_LEN, usually 2^14 bytes)
 | 
			
		||||
 * \brief          Set the maximum fragment length to emit and/or negotiate.
 | 
			
		||||
 *                 (Typical: the smaller of #MBEDTLS_SSL_IN_CONTENT_LEN and
 | 
			
		||||
 *                 #MBEDTLS_SSL_OUT_CONTENT_LEN, usually `2^14` bytes)
 | 
			
		||||
 *                 (Server: set maximum fragment length to emit,
 | 
			
		||||
 *                 usually negotiated by the client during handshake
 | 
			
		||||
 *                 usually negotiated by the client during handshake)
 | 
			
		||||
 *                 (Client: set maximum fragment length to emit *and*
 | 
			
		||||
 *                 negotiate with the server during handshake)
 | 
			
		||||
 *                 (Default: #MBEDTLS_SSL_MAX_FRAG_LEN_NONE)
 | 
			
		||||
 *
 | 
			
		||||
 * \note           With TLS, this currently only affects ApplicationData (sent
 | 
			
		||||
 *                 with \c mbedtls_ssl_read()), not handshake messages.
 | 
			
		||||
 *                 With DTLS, this affects both ApplicationData and handshake.
 | 
			
		||||
 * \note           On the client side, the maximum fragment length extension
 | 
			
		||||
 *                 *will not* be used, unless the maximum fragment length has
 | 
			
		||||
 *                 been set via this function to a value different than
 | 
			
		||||
 *                 #MBEDTLS_SSL_MAX_FRAG_LEN_NONE.
 | 
			
		||||
 *
 | 
			
		||||
 * \note           This sets the maximum length for a record's payload,
 | 
			
		||||
 *                 excluding record overhead that will be added to it, see
 | 
			
		||||
 *                 \c mbedtls_ssl_get_record_expansion().
 | 
			
		||||
 *
 | 
			
		||||
 * \note           With TLS, this currently only affects ApplicationData (sent
 | 
			
		||||
 *                 with \c mbedtls_ssl_read()), not handshake messages.
 | 
			
		||||
 *                 With DTLS, this affects both ApplicationData and handshake.
 | 
			
		||||
 *
 | 
			
		||||
 * \note           For DTLS, it is also possible to set a limit for the total
 | 
			
		||||
 *                 size of daragrams passed to the transport layer, including
 | 
			
		||||
 *                 record overhead, see \c mbedtls_ssl_set_mtu().
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user