[glib-networking/mcatanzaro/gnutls-ciphersuite-name: 20/20] gnutls: use gnutls_ciphersuite_get() if available

[Marge Bot <marge-bot src gnome org>]

commit 0ca1a62dfa07dbb556a08f7f71971a43a4092412
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Fri Feb 11 10:21:33 2022 -0600

    gnutls: use gnutls_ciphersuite_get() if available
    
    This is a simpler way to compute the ciphersuite name.
    
    As a bonus, it returns IANA-style ciphersuite names.
    
    https://gitlab.com/gnutls/gnutls/-/merge_requests/1513
    
    Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/202>

 tls/gnutls/gtlsconnection-gnutls.c | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 387f14d3..4f85a6b2 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -1098,6 +1098,9 @@ glib_protocol_version_from_gnutls (gnutls_protocol_t protocol_version)
 static gchar *
 get_ciphersuite_name (gnutls_session_t session)
 {
+#if GTLS_GNUTLS_CHECK_VERSION(3, 7, 4)
+  return g_strdup (gnutls_ciphersuite_get (session));
+#else
   gnutls_protocol_t protocol_version = gnutls_protocol_get_version (session);
   char *cipher_name;
   char *result;
@@ -1123,6 +1126,7 @@ get_ciphersuite_name (gnutls_session_t session)
   g_free (cipher_name);
 
   return result;
+#endif
 }
 
 static void