yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 18:45:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow configuring MBEDTLS_TLS_EXT_CID at compile time

Browse Source 
The numerical identifier of the CID extension hasn't been settled yet
and different implementations use values from different drafts. Allow
configuring the value at compile time.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-04-24 13:35:41 +02:00
parent b5939e814e
commit 065a1c8e3d
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/tls_ext_cid-config.txt Normal file
View File

@ -0,0 +1,3 @@
Features
* The identifier of the CID TLS extension can be configured by defining
MBEDTLS_TLS_EXT_CID at compile time.

11
include/mbedtls/config.h
View File

@ -3863,6 +3863,17 @@
//#define MBEDTLS_PSK_MAX_LEN 32 /**< Max size of TLS pre-shared keys, in bytes (default 256 bits) */ //#define MBEDTLS_PSK_MAX_LEN 32 /**< Max size of TLS pre-shared keys, in bytes (default 256 bits) */
//#define MBEDTLS_SSL_COOKIE_TIMEOUT 60 /**< Default expiration delay of DTLS cookies, in seconds if HAVE_TIME, or in number of cookies issued */ //#define MBEDTLS_SSL_COOKIE_TIMEOUT 60 /**< Default expiration delay of DTLS cookies, in seconds if HAVE_TIME, or in number of cookies issued */
/** \def MBEDTLS_TLS_EXT_CID
*
* At the time of writing, the CID extension has not been assigned its
* final value. Set this configuration option to make Mbed TLS use a
* different value.
*
* A future minor revision of Mbed TLS may change the default value of
* this option to match evolving standards and usage.
*/
//#define MBEDTLS_TLS_EXT_CID 254
/** /**
* Complete list of ciphersuites to use, in order of preference. * Complete list of ciphersuites to use, in order of preference.
* *

8
include/mbedtls/ssl.h
View File

@ -412,8 +412,14 @@
/* The value of the CID extension is still TBD as of /* The value of the CID extension is still TBD as of
* draft-ietf-tls-dtls-connection-id-05 * draft-ietf-tls-dtls-connection-id-05
* (https://tools.ietf.org/html/draft-ietf-tls-dtls-connection-id-05) */ * (https://tools.ietf.org/html/draft-ietf-tls-dtls-connection-id-05).
*
* A future minor revision of Mbed TLS may change the default value of
* this option to match evolving standards and usage.
*/
#if !defined(MBEDTLS_TLS_EXT_CID)
#define MBEDTLS_TLS_EXT_CID 254 /* TBD */ #define MBEDTLS_TLS_EXT_CID 254 /* TBD */
#endif
#define MBEDTLS_TLS_EXT_ECJPAKE_KKPP 256 /* experimental */ #define MBEDTLS_TLS_EXT_ECJPAKE_KKPP 256 /* experimental */

8
programs/test/query_config.c
View File

@ -2762,6 +2762,14 @@ int query_config( const char *config )
} }
#endif /* MBEDTLS_SSL_COOKIE_TIMEOUT */ #endif /* MBEDTLS_SSL_COOKIE_TIMEOUT */
#if defined(MBEDTLS_TLS_EXT_CID)
if( strcmp( "MBEDTLS_TLS_EXT_CID", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_TLS_EXT_CID );
return( 0 );
}
#endif /* MBEDTLS_TLS_EXT_CID */
#if defined(MBEDTLS_X509_MAX_INTERMEDIATE_CA) #if defined(MBEDTLS_X509_MAX_INTERMEDIATE_CA)
if( strcmp( "MBEDTLS_X509_MAX_INTERMEDIATE_CA", config ) == 0 ) if( strcmp( "MBEDTLS_X509_MAX_INTERMEDIATE_CA", config ) == 0 )
{ {