[glib-networking/mcatanzaro/session-resumption] Revert "gnutls: enable session tickets on server side"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/session-resumption] Revert "gnutls: enable session tickets on server side"
- Date: Mon, 28 Oct 2019 19:44:53 +0000 (UTC)
commit 19858618b144316df73cfd0549a093efb67031ea
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Oct 28 14:44:45 2019 -0500
Revert "gnutls: enable session tickets on server side"
This reverts commit 5506851dde4058cc1ccf5a8dda4f2994a9cef1a6.
tls/gnutls/gtlsserverconnection-gnutls.c | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
---
diff --git a/tls/gnutls/gtlsserverconnection-gnutls.c b/tls/gnutls/gtlsserverconnection-gnutls.c
index b16e5bd..00b2f97 100644
--- a/tls/gnutls/gtlsserverconnection-gnutls.c
+++ b/tls/gnutls/gtlsserverconnection-gnutls.c
@@ -49,8 +49,6 @@ struct _GTlsServerConnectionGnutls
gnutls_pcert_st *pcert;
unsigned int pcert_length;
gnutls_privkey_t pkey;
-
- gnutls_datum_t session_ticket_key;
};
static void g_tls_server_connection_gnutls_initable_interface_init (GInitableIface *iface);
@@ -99,12 +97,6 @@ g_tls_server_connection_gnutls_finalize (GObject *object)
clear_gnutls_certificate_copy (gnutls);
- if (gnutls->session_ticket_key.data)
- {
- gnutls_memset (gnutls->session_ticket_key.data, 0, gnutls->session_ticket_key.size);
- gnutls_free (gnutls->session_ticket_key.data);
- }
-
G_OBJECT_CLASS (g_tls_server_connection_gnutls_parent_class)->finalize (object);
}
@@ -113,11 +105,10 @@ g_tls_server_connection_gnutls_initable_init (GInitable *initable,
GCancellable *cancellable,
GError **error)
{
- GTlsServerConnectionGnutls *gnutls = G_TLS_SERVER_CONNECTION_GNUTLS (initable);
+ GTlsConnectionGnutls *gnutls = G_TLS_CONNECTION_GNUTLS (initable);
GTlsCertificate *cert;
gnutls_session_t session;
gnutls_certificate_credentials_t creds;
- int ret;
if (!g_tls_server_connection_gnutls_parent_initable_iface->init (initable, cancellable, error))
return FALSE;
@@ -135,18 +126,6 @@ g_tls_server_connection_gnutls_initable_init (GInitable *initable,
return FALSE;
}
- ret = gnutls_session_ticket_key_generate (&gnutls->session_ticket_key);
- if (ret != GNUTLS_E_SUCCESS)
- {
- g_warning ("Failed to generate session ticket key, session resumption will not work: %s",
gnutls_strerror (ret));
- }
- else
- {
- ret = gnutls_session_ticket_enable_server (session, &gnutls->session_ticket_key);
- if (ret != GNUTLS_E_SUCCESS)
- g_warning ("Failed to enable session tickets, session resumption will not work: %s", gnutls_strerror
(ret));
- }
-
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]