[glib-networking] Remove fallback for missing GNUTLS_E_PREMATURE_TERMINATION
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] Remove fallback for missing GNUTLS_E_PREMATURE_TERMINATION
- Date: Thu, 8 Feb 2018 06:16:03 +0000 (UTC)
commit 8fbf10871708979077742674e5418f444f58b88a
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Thu Feb 8 00:13:18 2018 -0600
Remove fallback for missing GNUTLS_E_PREMATURE_TERMINATION
GNUTLS_E_PREMATURE_TERMINATION was added in GnuTLS 3.0.18, released in
April 2012. We depend on GnuTLS 3.3 already, and will need to bump to
3.4 soon.
tls/gnutls/gtlsconnection-gnutls.c | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index b577d22..5c061f7 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -224,10 +224,6 @@ typedef struct
gint64 write_timeout;
GError *write_error;
GCancellable *write_cancellable;
-
-#ifndef GNUTLS_E_PREMATURE_TERMINATION
- gboolean eof;
-#endif
} GTlsConnectionGnutlsPrivate;
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GTlsConnectionGnutls, g_tls_connection_gnutls, G_TYPE_TLS_CONNECTION,
@@ -981,13 +977,7 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls,
g_mutex_unlock (&priv->op_mutex);
return status;
}
- else if (
-#ifdef GNUTLS_E_PREMATURE_TERMINATION
- status == GNUTLS_E_PREMATURE_TERMINATION
-#else
- status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && priv->eof
-#endif
- )
+ else if (status == GNUTLS_E_PREMATURE_TERMINATION)
{
if (priv->handshaking && !priv->ever_handshaked)
{
@@ -1488,10 +1478,6 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data,
if (ret < 0)
set_gnutls_error (gnutls, priv->read_error);
-#ifndef GNUTLS_E_PREMATURE_TERMINATION
- else if (ret == 0)
- priv->eof = TRUE;
-#endif
return ret;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]