diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-01 13:12:51 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-01 13:12:51 -0500 |
| commit | 30d676659c590d8ec6eb198ddd34777d581b9ceb (patch) | |
| tree | a5ae175d600cea4f1ebc138b433a6cdbb87acd1e | |
| parent | 698a5dc1b6447f93f59453401bd3bde445b0b8bf (diff) | |
| download | glib-networking-30d676659c590d8ec6eb198ddd34777d581b9ceb.tar.gz | |
Revert "Add TLS channel binding interface call to GTlsConnectionBase class"
This reverts commit 652771c9503f83722e53aaf92a42fcdee5ce3463.
| -rw-r--r-- | tls/base/gtlsconnection-base.c | 37 | ||||
| -rw-r--r-- | tls/base/gtlsconnection-base.h | 5 |
2 files changed, 0 insertions, 42 deletions
diff --git a/tls/base/gtlsconnection-base.c b/tls/base/gtlsconnection-base.c index 0bbc6b5..97ac24f 100644 --- a/tls/base/gtlsconnection-base.c +++ b/tls/base/gtlsconnection-base.c @@ -1406,41 +1406,6 @@ g_tls_connection_base_handshake_thread_verify_certificate (GTlsConnectionBase *t return accepted; } -static gboolean -g_tls_connection_base_get_binding_data (GTlsConnection *conn, - GTlsChannelBindingType type, - GByteArray *data, - GError **error) -{ - GTlsConnectionBase *tls = G_TLS_CONNECTION_BASE (conn); - GTlsConnectionBasePrivate *priv = g_tls_connection_base_get_instance_private (tls); - GTlsConnectionBaseClass *tls_class = G_TLS_CONNECTION_BASE_GET_CLASS (tls); - - g_assert (tls_class->get_channel_binding_data); - - if (!priv->ever_handshaked || priv->need_handshake) - { - g_set_error (error, G_TLS_CHANNEL_BINDING_ERROR, - G_TLS_CHANNEL_BINDING_ERROR_INVALID_STATE, - _("Handshake is not finished, no channel binding information yet")); - return FALSE; - } - - return tls_class->get_channel_binding_data (tls, type, data, error); -} - -static gboolean -g_tls_connection_base_dtls_get_binding_data (GDtlsConnection *conn, - GTlsChannelBindingType type, - GByteArray *data, - GError **error) -{ - GTlsConnectionBase *tls = G_TLS_CONNECTION_BASE (conn); - - return g_tls_connection_base_get_binding_data ((GTlsConnection *)tls, - type, data, error); -} - static void handshake_thread (GTask *task, gpointer object, @@ -2714,7 +2679,6 @@ g_tls_connection_base_class_init (GTlsConnectionBaseClass *klass) connection_class->handshake = g_tls_connection_base_handshake; connection_class->handshake_async = g_tls_connection_base_handshake_async; connection_class->handshake_finish = g_tls_connection_base_handshake_finish; - connection_class->get_binding_data = g_tls_connection_base_get_binding_data; iostream_class->get_input_stream = g_tls_connection_base_get_input_stream; iostream_class->get_output_stream = g_tls_connection_base_get_output_stream; @@ -2751,7 +2715,6 @@ g_tls_connection_base_dtls_connection_iface_init (GDtlsConnectionInterface *ifac iface->shutdown_finish = g_tls_connection_base_dtls_shutdown_finish; iface->set_advertised_protocols = g_tls_connection_base_dtls_set_advertised_protocols; iface->get_negotiated_protocol = g_tls_connection_base_dtls_get_negotiated_protocol; - iface->get_binding_data = g_tls_connection_base_dtls_get_binding_data; } static void diff --git a/tls/base/gtlsconnection-base.h b/tls/base/gtlsconnection-base.h index 7312683..45c14e5 100644 --- a/tls/base/gtlsconnection-base.h +++ b/tls/base/gtlsconnection-base.h @@ -79,11 +79,6 @@ struct _GTlsConnectionBaseClass gboolean (*is_session_resumed) (GTlsConnectionBase *tls); - gboolean (*get_channel_binding_data) (GTlsConnectionBase *tls, - GTlsChannelBindingType type, - GByteArray *data, - GError **error); - void (*push_io) (GTlsConnectionBase *tls, GIOCondition direction, gint64 timeout, |