Reword CID documentation

This commit is contained in:
Hanno Becker 2019-05-13 15:26:11 +01:00
parent 3a96828ead
commit ddf775a97f

View file

@ -1573,8 +1573,7 @@ void mbedtls_ssl_set_bio( mbedtls_ssl_context *ssl,
* \note The value of \p own_cid_len must match the value of the * \note The value of \p own_cid_len must match the value of the
* \c len parameter passed to mbedtls_ssl_conf_cid_len() * \c len parameter passed to mbedtls_ssl_conf_cid_len()
* when configuring the ::mbedtls_ssl_config that \p ssl * when configuring the ::mbedtls_ssl_config that \p ssl
* is bound to. See the documentation of * is bound to.
* mbedtls_ssl_conf_cid_len() for more information.
* *
* \note This CID configuration applies to subsequent handshakes * \note This CID configuration applies to subsequent handshakes
* performed on the SSL context \p ssl, but does not trigger * performed on the SSL context \p ssl, but does not trigger
@ -2314,19 +2313,12 @@ void mbedtls_ssl_conf_ciphersuites( mbedtls_ssl_config *conf,
* DTLS records using the CID mechanism. This must * DTLS records using the CID mechanism. This must
* not be larger than #MBEDTLS_SSL_CID_OUT_LEN_MAX. * not be larger than #MBEDTLS_SSL_CID_OUT_LEN_MAX.
* *
* \note The CID draft does not mandate that incoming CIDs * \note The CID specification allows implementations to either
* have equal lengths, but support for varying lengths * use a common length for all incoming connection IDs or
* significantly complicates record header parsing by * allow variable-length incoming IDs. Mbed TLS currently
* requiring a user-specified callback to perform the * requires a common length for all connections sharing the
* CID parsing, and Mbed TLS doesn't currently support it. * same SSL configuration; this allows simpler parsing of
* * record headers.
* \note The connection-specific API mbedtls_ssl_set_cid()
* must use the value of \p len as the value for its
* \c own_cid_len parameter, rendering the latter
* redundant at the moment. However, once variable
* length incoming CIDs are supported, the \c own_cid_len
* parameter in mbedtls_ssl_set_cid() will be flexible, and
* it is added already now to avoid a change of API.
* *
* \return \c 0 on success. * \return \c 0 on success.
* \return #MBEDTLS_ERR_SSL_BAD_INPUT_DATA if \p own_cid_len * \return #MBEDTLS_ERR_SSL_BAD_INPUT_DATA if \p own_cid_len