summaryrefslogtreecommitdiff
path: root/gio/gioenums.h
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2020-09-01 13:14:14 -0500
committerMichael Catanzaro <mcatanzaro@gnome.org>2020-09-01 13:14:14 -0500
commit6d1cb13c4f30b69fb55f546283545383a6b3f4a8 (patch)
tree78d345452a435af120fd687d7cccc783040476ae /gio/gioenums.h
parentb660ffe161776db1bddee3c7212b1bd27cdd658c (diff)
downloadglib-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/gioenums.h')
-rw-r--r--gio/gioenums.h55
1 files changed, 0 insertions, 55 deletions
diff --git a/gio/gioenums.h b/gio/gioenums.h
index 2692b746d..8aede1af6 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -1614,61 +1614,6 @@ typedef enum {
} GTlsAuthenticationMode;
/**
- * GTlsChannelBindingType:
- * @G_TLS_CHANNEL_BINDING_TLS_UNIQUE:
- * [`tls-unique`](https://tools.ietf.org/html/rfc5929#section-3) binding
- * type
- * @G_TLS_CHANNEL_BINDING_TLS_SERVER_END_POINT:
- * [`tls-server-end-point`](https://tools.ietf.org/html/rfc5929#section-4)
- * binding type
- *
- * The type of TLS channel binding data to retrieve from #GTlsConnection
- * or #GDtlsConnection, as documented by RFC 5929. The
- * [`tls-unique-for-telnet`](https://tools.ietf.org/html/rfc5929#section-5)
- * binding type is not currently implemented.
- *
- * Since: 2.66
- */
-GLIB_AVAILABLE_TYPE_IN_2_66
-typedef enum {
- G_TLS_CHANNEL_BINDING_TLS_UNIQUE,
- G_TLS_CHANNEL_BINDING_TLS_SERVER_END_POINT
-} GTlsChannelBindingType;
-
-/**
- * GTlsChannelBindingError:
- * @G_TLS_CHANNEL_BINDING_ERROR_NOT_IMPLEMENTED: Either entire binding
- * retrieval facility or specific binding type is not implemented in the
- * TLS backend.
- * @G_TLS_CHANNEL_BINDING_ERROR_INVALID_STATE: The handshake is not yet
- * complete on the connection which is a strong requirement for any existing
- * binding type.
- * @G_TLS_CHANNEL_BINDING_ERROR_NOT_AVAILABLE: Handshake is complete but
- * binding data is not available. That normally indicates the TLS
- * implementation failed to provide the binding data. For example, some
- * implementations do not provide a peer certificate for resumed connections.
- * @G_TLS_CHANNEL_BINDING_ERROR_NOT_SUPPORTED: Binding type is not supported
- * on the current connection. This error could be triggered when requesting
- * `tls-server-end-point` binding data for a certificate which has no hash
- * function or uses multiple hash functions.
- * @G_TLS_CHANNEL_BINDING_ERROR_GENERAL_ERROR: Any other backend error
- * preventing binding data retrieval.
- *
- * An error code used with %G_TLS_CHANNEL_BINDING_ERROR in a #GError to
- * indicate a TLS channel binding retrieval error.
- *
- * Since: 2.66
- */
-GLIB_AVAILABLE_TYPE_IN_2_66
-typedef enum {
- G_TLS_CHANNEL_BINDING_ERROR_NOT_IMPLEMENTED,
- G_TLS_CHANNEL_BINDING_ERROR_INVALID_STATE,
- G_TLS_CHANNEL_BINDING_ERROR_NOT_AVAILABLE,
- G_TLS_CHANNEL_BINDING_ERROR_NOT_SUPPORTED,
- G_TLS_CHANNEL_BINDING_ERROR_GENERAL_ERROR
-} GTlsChannelBindingError;
-
-/**
* GTlsRehandshakeMode:
* @G_TLS_REHANDSHAKE_NEVER: Never allow rehandshaking
* @G_TLS_REHANDSHAKE_SAFELY: Allow safe rehandshaking only