DTLS CID

doxygen/mbedtls.doxyfile

@@ -1622,7 +1622,20 @@ PREDEFINED = WIN32 \
  ENABLE_PLUGIN \
  ENABLE_MANAGEMENT \
  ENABLE_OCC \
- HAVE_GETTIMEOFDAY
+ HAVE_GETTIMEOFDAY \
+ MBEDTLS_SSL_DTLS_CONNECTION_ID \
+ MBEDTLS_SSL_PROTO_DTLS \
+ MBEDTLS_SSL_SESSION_TICKETS \
+ MBEDTLS_SSL_CLI_C \
+ MBEDTLS_SSL_MAX_FRAGMENT_LENGTH \
+ MBEDTLS_SSL_ENCRYPT_THEN_MAC \
+ MBEDTLS_SSL_EXPORT_KEYS \
+ MBEDTLS_SSL_SERVER_NAME_INDICATION \
+ MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED \
+ MBEDTLS_SSL_DTLS_HELLO_VERIFY \
+ MBEDTLS_SSL_EXTENDED_MASTER_SECRET \
+ MBEDTLS_DEBUG_C
+
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.

include/mbedtls/check_config.h

@@ -679,6 +679,12 @@
 #error "MBEDTLS_SSL_CID_OUT_LEN_MAX too large (max 255)"
 #endif
 
+#if !defined(MBEDTLS_SSL_DTLS_CONNECTION_ID) && \
+ defined(MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT)
+#error "MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT defined, but not all prerequsites"
+#endif
+
+
 #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) && \
  !defined(MBEDTLS_SSL_PROTO_TLS1_2)
 #error "MBEDTLS_SSL_ENCRYPT_THEN_MAC defined, but not all prerequsites"
@@ -694,7 +700,8 @@
 #endif
 
 #if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION) && \
- !defined(MBEDTLS_X509_CRT_PARSE_C)
+ !(defined(MBEDTLS_X509_CRT_PARSE_C) || \
+ defined(MBEDTLS_SSL_PROTO_DTLS))
 #error "MBEDTLS_SSL_SERVER_NAME_INDICATION defined, but not all prerequisites"
 #endif
 

include/mbedtls/mbedtls_config.h

@@ -1310,20 +1310,14 @@
 /**
  * \def MBEDTLS_SSL_DTLS_CONNECTION_ID
  *
- * Enable support for the DTLS Connection ID extension
- * (version draft-ietf-tls-dtls-connection-id-05,
- * https://tools.ietf.org/html/draft-ietf-tls-dtls-connection-id-05)
+ * Enable support for the DTLS Connection ID extension,
  * which allows to identify DTLS connections across changes
  * in the underlying transport.
  *
  * Setting this option enables the SSL APIs `mbedtls_ssl_set_cid()`,
  * `mbedtls_ssl_get_peer_cid()` and `mbedtls_ssl_conf_cid()`.
  * See the corresponding documentation for more information.
  *
- * \warning The Connection ID extension is still in draft state.
- * We make no stability promises for the availability
- * or the shape of the API controlled by this option.
- *
  * The maximum lengths of outgoing and incoming CIDs can be configured
  * through the options
  * - MBEDTLS_SSL_CID_OUT_LEN_MAX
@@ -1333,7 +1327,23 @@
  *
  * Uncomment to enable the Connection ID extension.
  */
-//#define MBEDTLS_SSL_DTLS_CONNECTION_ID
+#define MBEDTLS_SSL_DTLS_CONNECTION_ID
+
+
+/**
+ * \def MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT
+ *
+ * Defines whether RFC 9146 (default) or the legacy version
+ * (version draft-ietf-tls-dtls-connection-id-05,
+ * https://tools.ietf.org/html/draft-ietf-tls-dtls-connection-id-05)
+ * is used.
+ *
+ * Set the value to 0 for the standard version, and
+ * 1 for the legacy draft version.
+ *
+ * Requires: MBEDTLS_SSL_DTLS_CONNECTION_ID
+ */
+#define MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT 0
 
 /**
  * \def MBEDTLS_SSL_ASYNC_PRIVATE
@@ -1644,7 +1654,7 @@
  *
  * Enable support for RFC 6066 server name indication (SNI) in SSL.
  *
- * Requires: MBEDTLS_X509_CRT_PARSE_C
+ * Requires: MBEDTLS_X509_CRT_PARSE_C or MBEDTLS_SSL_PROTO_DTLS
  *
  * Comment this macro to disable support for server name indication in SSL
  */
@@ -3242,17 +3252,6 @@
 //#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.
  *

include/mbedtls/ssl.h

@@ -381,6 +381,13 @@
 #endif
 
 /* \} name SECTION: Module settings */
+/*
+ * Default to standard CID mode
+ */
+#if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID) && \
+ !defined(MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT)
+#define MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT 0
+#endif
 
 /*
  * Length of the verify data for secure renegotiation
@@ -547,15 +554,10 @@
 #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 */
 
-/* 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).
- *
- * 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 */
+#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
 
 #define MBEDTLS_TLS_EXT_ECJPAKE_KKPP 256 /* experimental */
@@ -1315,7 +1317,7 @@ struct mbedtls_ssl_config
 #endif
 
 #if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY) && defined(MBEDTLS_SSL_SRV_C)
- /** Callback to create & write a cookie for ClientHello veirifcation */
+ /** Callback to create & write a cookie for ClientHello verification */
  int (*MBEDTLS_PRIVATE(f_cookie_write))( void *, unsigned char **, unsigned char *,
  const unsigned char *, size_t );
  /** Callback to verify validity of a ClientHello cookie */
@@ -1618,7 +1620,7 @@ struct mbedtls_ssl_context
  /*
  * User settings
  */
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_X509_CRT_PARSE_C) || defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
  char *MBEDTLS_PRIVATE(hostname); /*!< expected peer CN for verification
  (and SNI if available) */
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
@@ -1884,8 +1886,9 @@ void mbedtls_ssl_set_bio( mbedtls_ssl_context *ssl,
  * \brief Configure the use of the Connection ID (CID)
  * extension in the next handshake.
  *
- * Reference: draft-ietf-tls-dtls-connection-id-05
+ * Reference: RFC 9146 (or draft-ietf-tls-dtls-connection-id-05
  * https://tools.ietf.org/html/draft-ietf-tls-dtls-connection-id-05
+ * for legacy version)
  *
  * The DTLS CID extension allows the reliable association of
  * DTLS records to DTLS connections across changes in the
@@ -3314,7 +3317,7 @@ void mbedtls_ssl_conf_sig_algs( mbedtls_ssl_config *conf,
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
 #endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */
 
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_X509_CRT_PARSE_C) || defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
 /**
  * \brief Set or reset the hostname to check against the received
  * server certificate. It sets the ServerName TLS extension,
@@ -3334,9 +3337,9 @@ void mbedtls_ssl_conf_sig_algs( mbedtls_ssl_config *conf,
  * On too long input failure, old hostname is unchanged.
  */
 int mbedtls_ssl_set_hostname( mbedtls_ssl_context *ssl, const char *hostname );
-#endif /* MBEDTLS_X509_CRT_PARSE_C */
+#endif /* MBEDTLS_X509_CRT_PARSE_C || MBEDTLS_SSL_SERVER_NAME_INDICATION */
 
-#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
 /**
  * \brief Set own certificate and key for the current handshake
  *
@@ -3367,7 +3370,9 @@ int mbedtls_ssl_set_hs_own_cert( mbedtls_ssl_context *ssl,
 void mbedtls_ssl_set_hs_ca_chain( mbedtls_ssl_context *ssl,
  mbedtls_x509_crt *ca_chain,
  mbedtls_x509_crl *ca_crl );
+#endif /* MBEDTLS_X509_CRT_PARSE_C */
 
+#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
 /**
  * \brief Set authmode for the current handshake.
  *

library/ssl_cli.c

@@ -478,9 +478,6 @@ static int ssl_write_cid_ext( mbedtls_ssl_context *ssl,
  size_t ext_len;
 
  /*
- * Quoting draft-ietf-tls-dtls-connection-id-05
- * https://tools.ietf.org/html/draft-ietf-tls-dtls-connection-id-05
- *
  * struct {
  * opaque cid<0..2^8-1>;
  * } ConnectionId;