Merge branch 'mcatanzaro/tls1.3-handshake' into 'master'

Update documentation of g_tls_connection_handshake() again

See merge request GNOME/glib!467
This commit is contained in:
Philip Withnall 2018-11-12 23:50:16 +00:00
commit f81a2b3de2

View File

@ -757,8 +757,10 @@ g_tls_connection_get_rehandshake_mode (GTlsConnection *conn)
* the beginning of the communication, you do not need to call this * the beginning of the communication, you do not need to call this
* function explicitly unless you want clearer error reporting. * function explicitly unless you want clearer error reporting.
* However, you may call g_tls_connection_handshake() later on to * However, you may call g_tls_connection_handshake() later on to
* rehandshake, if TLS 1.2 or older is in use. With TLS 1.3, this will * rehandshake, if TLS 1.2 or older is in use. With TLS 1.3, the
* instead perform a rekey. * behavior is undefined but guaranteed to be reasonable and
* nondestructive, so most older code should be expected to continue to
* work without changes.
* *
* #GTlsConnection::accept_certificate may be emitted during the * #GTlsConnection::accept_certificate may be emitted during the
* handshake. * handshake.