diff options
author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-01 13:14:14 -0500 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-01 13:14:14 -0500 |
commit | 6d1cb13c4f30b69fb55f546283545383a6b3f4a8 (patch) | |
tree | 78d345452a435af120fd687d7cccc783040476ae /gio/gdtlsconnection.c | |
parent | b660ffe161776db1bddee3c7212b1bd27cdd658c (diff) | |
download | glib-revert-channel-bindings.tar.gz |
Revert "Add g_(d)tls_connection_get_channel_binding_data calls and enums"revert-channel-bindings
This reverts commit 44524b9daa622058e3e55617b9b0d4c986e3b8b3.
We were not able to implement this API in glib-networking because it
wasn't released until glib 2.65.1, one day before freeze. We eventually
landed the implementation via the feature freeze break process, but
failed to notice that it introduced new strings. It's much too late to
be adding new translatable strings, so implementation will have to wait
until next release cycle, after the first glib 2.67 release.
https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/124
Diffstat (limited to 'gio/gdtlsconnection.c')
-rw-r--r-- | gio/gdtlsconnection.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/gio/gdtlsconnection.c b/gio/gdtlsconnection.c index 4bbc88d7a..2704133ff 100644 --- a/gio/gdtlsconnection.c +++ b/gio/gdtlsconnection.c @@ -26,7 +26,6 @@ #include "gsocket.h" #include "gtlsbackend.h" #include "gtlscertificate.h" -#include "gtlsconnection.h" #include "gdtlsclientconnection.h" #include "gtlsdatabase.h" #include "gtlsinteraction.h" @@ -1074,52 +1073,3 @@ g_dtls_connection_get_negotiated_protocol (GDtlsConnection *conn) return iface->get_negotiated_protocol (conn); } - -/** - * g_dtls_connection_get_channel_binding_data: - * @conn: a #GDtlsConnection - * @type: #GTlsChannelBindingType type of data to fetch - * @data: (out callee-allocates)(optional)(transfer none): #GByteArray is - * filled with the binding data, or %NULL - * @error: a #GError pointer, or %NULL - * - * Query the TLS backend for TLS channel binding data of @type for @conn. - * - * This call retrieves TLS channel binding data as specified in RFC - * [5056](https://tools.ietf.org/html/rfc5056), RFC - * [5929](https://tools.ietf.org/html/rfc5929), and related RFCs. The - * binding data is returned in @data. The @data is resized by the callee - * using #GByteArray buffer management and will be freed when the @data - * is destroyed by g_byte_array_unref(). If @data is %NULL, it will only - * check whether TLS backend is able to fetch the data (e.g. whether @type - * is supported by the TLS backend). It does not guarantee that the data - * will be available though. That could happen if TLS connection does not - * support @type or the binding data is not available yet due to additional - * negotiation or input required. - * - * Returns: %TRUE on success, %FALSE otherwise - * - * Since: 2.66 - */ -gboolean -g_dtls_connection_get_channel_binding_data (GDtlsConnection *conn, - GTlsChannelBindingType type, - GByteArray *data, - GError **error) -{ - GDtlsConnectionInterface *iface; - - g_return_val_if_fail (G_IS_DTLS_CONNECTION (conn), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - iface = G_DTLS_CONNECTION_GET_INTERFACE (conn); - if (iface->get_binding_data == NULL) - { - g_set_error_literal (error, G_TLS_CHANNEL_BINDING_ERROR, - G_TLS_CHANNEL_BINDING_ERROR_NOT_IMPLEMENTED, - _("TLS backend does not implement TLS binding retrieval")); - return FALSE; - } - - return iface->get_binding_data (conn, type, data, error); -} |