yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-24 18:31:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4427 from gilles-peskine-arm/tls_ext_cid-config-2.x

Browse source 
Backport 2.x: Allow configuring MBEDTLS_TLS_EXT_CID at compile time
This commit is contained in:
Manuel Pégourié-Gonnard 2021-08-13 10:50:02 +02:00 committed by GitHub
parent 9c6cc6945e 065a1c8e3d
commit f87422f019
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -3868,6 +3868,17 @@
//#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 */
/** \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.
*

8
include/mbedtls/ssl.h
View file

@ -470,8 +470,14 @@
/* The value of the CID extension is still TBD as of
* 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 */
#endif
#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 */
#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( strcmp( "MBEDTLS_X509_MAX_INTERMEDIATE_CA", config ) == 0 )
{