luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-28 05:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request GNOME/glib!575
This commit is contained in:
Michael Catanzaro 2019-01-08 18:29:20 +00:00
commit 8109eaae5d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gdtlsconnection.c
View File

@ -295,8 +295,8 @@ g_dtls_connection_default_init (GDtlsConnectionInterface *iface)
* let the user decide whether or not to accept the certificate, you * let the user decide whether or not to accept the certificate, you
* would have to return %FALSE from the signal handler on the first * would have to return %FALSE from the signal handler on the first
* attempt, and then after the connection attempt returns a * attempt, and then after the connection attempt returns a
* %G_TLS_ERROR_HANDSHAKE, you can interact with the user, and if * %G_TLS_ERROR_BAD_CERTIFICATE, you can interact with the user, and
* the user decides to accept the certificate, remember that fact, * if the user decides to accept the certificate, remember that fact,
* create a new connection, and return %TRUE from the signal handler * create a new connection, and return %TRUE from the signal handler
* the next time. * the next time.
* *

3
gio/gioenums.h
View File

@ -1505,7 +1505,8 @@ typedef enum
* GTlsError: * GTlsError:
* @G_TLS_ERROR_UNAVAILABLE: No TLS provider is available * @G_TLS_ERROR_UNAVAILABLE: No TLS provider is available
* @G_TLS_ERROR_MISC: Miscellaneous TLS error * @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 * @G_TLS_ERROR_NOT_TLS: The TLS handshake failed because the
* peer does not seem to be a TLS server. * peer does not seem to be a TLS server.
* @G_TLS_ERROR_HANDSHAKE: The TLS handshake failed because the * @G_TLS_ERROR_HANDSHAKE: The TLS handshake failed because the

4
gio/gtlsconnection.c
View File

@ -323,8 +323,8 @@ g_tls_connection_class_init (GTlsConnectionClass *klass)
* let the user decide whether or not to accept the certificate, you * let the user decide whether or not to accept the certificate, you
* would have to return %FALSE from the signal handler on the first * would have to return %FALSE from the signal handler on the first
* attempt, and then after the connection attempt returns a * attempt, and then after the connection attempt returns a
* %G_TLS_ERROR_HANDSHAKE, you can interact with the user, and if * %G_TLS_ERROR_BAD_CERTIFICATE, you can interact with the user, and
* the user decides to accept the certificate, remember that fact, * if the user decides to accept the certificate, remember that fact,
* create a new connection, and return %TRUE from the signal handler * create a new connection, and return %TRUE from the signal handler
* the next time. * the next time.
* *