[glib-networking] Revert "gnutls: fix the build with GnuTLS 3.7.1"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] Revert "gnutls: fix the build with GnuTLS 3.7.1"
- Date: Thu, 24 Jun 2021 15:23:03 +0000 (UTC)
commit 550b70ca9f21395033234a6922183104ad0f7af5
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Thu Jun 24 15:23:02 2021 +0000
Revert "gnutls: fix the build with GnuTLS 3.7.1"
This reverts commit df8146a28fb0beadaf14547de4efd1cbb8173db6
tls/gnutls/gtlsconnection-gnutls.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index d6e7100..cc07c1f 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -1039,7 +1039,7 @@ gnutls_get_binding_tls_server_end_point (GTlsConnectionGnutls *gnutls,
GByteArray *data,
GError **error)
{
-#if GNUTLS_VERSION_MAJOR > 3 || GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 7 &&
GNUTLS_VERSION_MICRO >= 2
+#if GNUTLS_VERSION_MAJOR > 3 || GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 7
return gnutls_get_binding (gnutls, data, GNUTLS_CB_TLS_SERVER_END_POINT, error);
#else
GTlsConnectionGnutlsPrivate *priv = g_tls_connection_gnutls_get_instance_private (gnutls);
@@ -1139,7 +1139,7 @@ gnutls_get_binding_tls_server_end_point (GTlsConnectionGnutls *gnutls,
#endif
}
-#if !(GNUTLS_VERSION_MAJOR > 3 || GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 7 &&
GNUTLS_VERSION_MICRO >= 2)
+#if !(GNUTLS_VERSION_MAJOR > 3 || GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 7)
#define RFC5705_LABEL_DATA "EXPORTER-Channel-Binding"
#define RFC5705_LABEL_LEN 24
#endif
@@ -1151,7 +1151,7 @@ gnutls_get_binding_tls_exporter (GTlsConnectionGnutls *gnutls,
GByteArray *data,
GError **error)
{
-#if GNUTLS_VERSION_MAJOR > 3 || GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 7 &&
GNUTLS_VERSION_MICRO >= 2
+#if GNUTLS_VERSION_MAJOR > 3 || GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 7
return gnutls_get_binding (gnutls, data, GNUTLS_CB_TLS_EXPORTER, error);
#else
GTlsConnectionGnutlsPrivate *priv = g_tls_connection_gnutls_get_instance_private (gnutls);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]