Commit 8109eaae authored by Michael Catanzaro's avatar Michael Catanzaro

Merge branch 'wip/mjog/accept-certificate-docs' into 'master'

gio: Update bad cert error in accept-certificate and GTlsError docs

See merge request !575
parents 0d3fe5c3 d7aedeff
Pipeline #50032 failed with stages
in 9 minutes and 57 seconds
......@@ -295,8 +295,8 @@ g_dtls_connection_default_init (GDtlsConnectionInterface *iface)
* let the user decide whether or not to accept the certificate, you
* would have to return %FALSE from the signal handler on the first
* attempt, and then after the connection attempt returns a
* %G_TLS_ERROR_HANDSHAKE, you can interact with the user, and if
* the user decides to accept the certificate, remember that fact,
* %G_TLS_ERROR_BAD_CERTIFICATE, you can interact with the user, and
* if the user decides to accept the certificate, remember that fact,
* create a new connection, and return %TRUE from the signal handler
* the next time.
*
......
......@@ -1505,7 +1505,8 @@ typedef enum
* GTlsError:
* @G_TLS_ERROR_UNAVAILABLE: No TLS provider is available
* @G_TLS_ERROR_MISC: Miscellaneous TLS error
* @G_TLS_ERROR_BAD_CERTIFICATE: A certificate could not be parsed
* @G_TLS_ERROR_BAD_CERTIFICATE: The certificate presented could not
* be parsed or failed validation.
* @G_TLS_ERROR_NOT_TLS: The TLS handshake failed because the
* peer does not seem to be a TLS server.
* @G_TLS_ERROR_HANDSHAKE: The TLS handshake failed because the
......
......@@ -323,8 +323,8 @@ g_tls_connection_class_init (GTlsConnectionClass *klass)
* let the user decide whether or not to accept the certificate, you
* would have to return %FALSE from the signal handler on the first
* attempt, and then after the connection attempt returns a
* %G_TLS_ERROR_HANDSHAKE, you can interact with the user, and if
* the user decides to accept the certificate, remember that fact,
* %G_TLS_ERROR_BAD_CERTIFICATE, you can interact with the user, and
* if the user decides to accept the certificate, remember that fact,
* create a new connection, and return %TRUE from the signal handler
* the next time.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment