1From f59e02a1439c70616547d51abf0a6da33e095e80 Mon Sep 17 00:00:00 2001 2From: Simon McVittie <smcv@collabora.com> 3Date: Thu, 31 Mar 2022 14:28:56 +0100 4Subject: [PATCH] gioenums: Add G_TLS_CERTIFICATE_FLAGS_NONE 5 6This makes the absence of flags (in other words, a valid certificate) 7more self-documenting. 8 9Signed-off-by: Simon McVittie <smcv@collabora.com> 10 11Conflict:NA 12Reference:https://gitlab.gnome.org/GNOME/glib/-/commit/f59e02a1439c70616547d51abf0a6da33e095e80 13 14--- 15 gio/gdtlsclientconnection.c | 2 +- 16 gio/gioenums.h | 2 ++ 17 gio/gtlscertificate.c | 2 ++ 18 gio/gtlsclientconnection.c | 2 +- 19 4 files changed, 6 insertions(+), 2 deletions(-) 20 21diff --git a/gio/gdtlsclientconnection.c b/gio/gdtlsclientconnection.c 22index 74cce7572f..403c8b74d0 100644 23--- a/gio/gdtlsclientconnection.c 24+++ b/gio/gdtlsclientconnection.c 25@@ -191,7 +191,7 @@ g_dtls_client_connection_new (GDatagramBased *base_socket, 26 GTlsCertificateFlags 27 g_dtls_client_connection_get_validation_flags (GDtlsClientConnection *conn) 28 { 29- GTlsCertificateFlags flags = 0; 30+ GTlsCertificateFlags flags = G_TLS_CERTIFICATE_FLAGS_NONE; 31 32 g_return_val_if_fail (G_IS_DTLS_CLIENT_CONNECTION (conn), 0); 33 34diff --git a/gio/gioenums.h b/gio/gioenums.h 35index 0d27c15a2b..deacd62206 100644 36--- a/gio/gioenums.h 37+++ b/gio/gioenums.h 38@@ -1578,6 +1578,7 @@ typedef enum { 39 40 /** 41 * GTlsCertificateFlags: 42+ * @G_TLS_CERTIFICATE_FLAGS_NONE: No flags. Since: 2.74 43 * @G_TLS_CERTIFICATE_UNKNOWN_CA: The signing certificate authority is 44 * not known. 45 * @G_TLS_CERTIFICATE_BAD_IDENTITY: The certificate does not match the 46@@ -1609,6 +1610,7 @@ typedef enum { 47 * Since: 2.28 48 */ 49 typedef enum { 50+ G_TLS_CERTIFICATE_FLAGS_NONE GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0, 51 G_TLS_CERTIFICATE_UNKNOWN_CA = (1 << 0), 52 G_TLS_CERTIFICATE_BAD_IDENTITY = (1 << 1), 53 G_TLS_CERTIFICATE_NOT_ACTIVATED = (1 << 2), 54diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c 55index ca09b180ae..e97b8ac144 100644 56--- a/gio/gtlscertificate.c 57+++ b/gio/gtlscertificate.c 58@@ -1121,6 +1121,8 @@ g_tls_certificate_get_issuer (GTlsCertificate *cert) 59 * check a certificate against a CA that is not part of the system 60 * CA database. 61 * 62+ * If @cert is valid, %G_TLS_CERTIFICATE_FLAGS_NONE is returned. 63+ * 64 * If @identity is not %NULL, @cert's name(s) will be compared against 65 * it, and %G_TLS_CERTIFICATE_BAD_IDENTITY will be set in the return 66 * value if it does not match. If @identity is %NULL, that bit will 67diff --git a/gio/gtlsclientconnection.c b/gio/gtlsclientconnection.c 68index a6dc897f9f..e6c77b681d 100644 69--- a/gio/gtlsclientconnection.c 70+++ b/gio/gtlsclientconnection.c 71@@ -213,7 +213,7 @@ g_tls_client_connection_new (GIOStream *base_io_stream, 72 GTlsCertificateFlags 73 g_tls_client_connection_get_validation_flags (GTlsClientConnection *conn) 74 { 75- GTlsCertificateFlags flags = 0; 76+ GTlsCertificateFlags flags = G_TLS_CERTIFICATE_FLAGS_NONE; 77 78 g_return_val_if_fail (G_IS_TLS_CLIENT_CONNECTION (conn), 0); 79 80-- 81GitLab 82 83