coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-28 18:07:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge df620dae4304e6e8a6226624969e8ea1cc7d33a3 into 4fdb917aae2fb5876e04f88621630712a906a067

Browse Source
This commit is contained in:
Etienne Carriere 2026-10-27 14:20:54 +00:00 committed by GitHub
commit f7020940ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/fix-dtls-connection-id-compat-build.txt Normal file
View File

@ -0,0 +1,3 @@
Bugfix
* Fix a compilation warning in ssl.h when MBEDTLS_SSL_DTLS_CONNECTION_ID
and MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT are not defined. Fixes #10207.

6
include/mbedtls/ssl.h
View File

@ -656,11 +656,17 @@
#define MBEDTLS_TLS_EXT_SIG_ALG_CERT 50 /* RFC 8446 TLS 1.3 */
#define MBEDTLS_TLS_EXT_KEY_SHARE 51 /* RFC 8446 TLS 1.3 */
/*
* MBEDTLS_TLS_EXT_CID is required only when
* MBEDTLS_SSL_DTLS_CONNECTION_ID is defined.
*/
#if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID)
#if MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT == 0
#define MBEDTLS_TLS_EXT_CID 54 /* RFC 9146 DTLS 1.2 CID */
#else
#define MBEDTLS_TLS_EXT_CID 254 /* Pre-RFC 9146 DTLS 1.2 CID */
#endif
#endif
#define MBEDTLS_TLS_EXT_ECJPAKE_KKPP 256 /* experimental */