Merge remote-tracking branch 'upstream-public/pr/936' into development-proposed

This commit is contained in:
Gilles Peskine 2018-03-10 23:51:58 +01:00
commit 29d7d4da2f
2 changed files with 8 additions and 2 deletions

View file

@ -971,8 +971,13 @@ void mbedtls_ssl_init( mbedtls_ssl_context *ssl );
* \note No copy of the configuration context is made, it can be
* shared by many mbedtls_ssl_context structures.
*
* \warning Modifying the conf structure after it has been used in this
* function is unsupported!
* \warning The conf structure will be accessed during the session.
* It must not be modified or freed as long as the session
* is active.
*
* \warning This function must be called exactly once per context.
* Calling mbedtls_ssl_setup again is not supported, even
* if no session is active.
*
* \param ssl SSL context
* \param conf SSL configuration to use