mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstdtlsconnection: Propagate errors from key export to the caller

Browse source 
Otherwise the DTLS connection silently does nothing instead of reporting
an error via the elements.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1156>
This commit is contained in:
Sebastian Dröge 2020-06-26 10:20:04 +03:00
parent 3dd2bbf23c
commit 3864c9f97f
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ext/dtls/gstdtlsconnection.c
View file

@ -118,7 +118,7 @@ static void gst_dtls_connection_get_property (GObject *, guint prop_id,
GValue *, GParamSpec *); GValue *, GParamSpec *);
static void log_state (GstDtlsConnection *, const gchar * str); static void log_state (GstDtlsConnection *, const gchar * str);
static void export_srtp_keys (GstDtlsConnection *); static gboolean export_srtp_keys (GstDtlsConnection *, GError ** err);
static GstFlowReturn openssl_poll (GstDtlsConnection *, gboolean * notify_state, static GstFlowReturn openssl_poll (GstDtlsConnection *, gboolean * notify_state,
GError ** err); GError ** err);
static GstFlowReturn handle_error (GstDtlsConnection * self, int ret, static GstFlowReturn handle_error (GstDtlsConnection * self, int ret,
@ -850,8 +850,8 @@ log_state (GstDtlsConnection * self, const gchar * str)
#endif #endif
} }
static void static gboolean
export_srtp_keys (GstDtlsConnection * self) export_srtp_keys (GstDtlsConnection * self, GError ** err)
{ {
typedef struct typedef struct
{ {
@ -889,16 +889,24 @@ export_srtp_keys (GstDtlsConnection * self)
NULL, 0, 0); NULL, 0, 0);
if (!success) { if (!success) {
GST_WARNING_OBJECT (self, "failed to export srtp keys"); GST_WARNING_OBJECT (self, "Failed to export SRTP keys");
return; if (err)
*err =
g_error_new_literal (GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ,
"Failed to export SRTP keys");
return FALSE;
} }
profile = SSL_get_selected_srtp_profile (self->priv->ssl); profile = SSL_get_selected_srtp_profile (self->priv->ssl);
if (!profile) { if (!profile) {
GST_WARNING_OBJECT (self, GST_WARNING_OBJECT (self,
"no srtp capabilities negotiated during handshake"); "No SRTP capabilities negotiated during handshake");
return; if (err)
*err =
g_error_new_literal (GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ,
"No SRTP capabilities negotiated during handshake");
return FALSE;
} }
GST_INFO_OBJECT (self, "keys received, profile is %s", profile->name); GST_INFO_OBJECT (self, "keys received, profile is %s", profile->name);
@ -913,8 +921,13 @@ export_srtp_keys (GstDtlsConnection * self)
auth = GST_DTLS_SRTP_AUTH_HMAC_SHA1_32; auth = GST_DTLS_SRTP_AUTH_HMAC_SHA1_32;
break; break;
default: default:
GST_WARNING_OBJECT (self, "invalid crypto suite set by handshake"); GST_WARNING_OBJECT (self,
return; "Invalid/unsupported crypto suite set by handshake");
if (err)
*err =
g_error_new_literal (GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ,
"Invalid/unsupported crypto suite set by handshake");
return FALSE;
} }
client_key.key = exported_keys.client_key; client_key.key = exported_keys.client_key;
@ -935,6 +948,8 @@ export_srtp_keys (GstDtlsConnection * self)
} }
self->priv->keys_exported = TRUE; self->priv->keys_exported = TRUE;
return TRUE;
} }
static int static int
@ -1047,7 +1062,10 @@ openssl_poll (GstDtlsConnection * self, gboolean * notify_state, GError ** err)
if (!self->priv->keys_exported) { if (!self->priv->keys_exported) {
GST_INFO_OBJECT (self, GST_INFO_OBJECT (self,
"handshake just completed successfully, exporting keys"); "handshake just completed successfully, exporting keys");
export_srtp_keys (self);
if (!export_srtp_keys (self, err))
return GST_FLOW_ERROR;
if (self->priv->connection_state != GST_DTLS_CONNECTION_STATE_FAILED if (self->priv->connection_state != GST_DTLS_CONNECTION_STATE_FAILED
&& self->priv->connection_state != GST_DTLS_CONNECTION_STATE_CLOSED && self->priv->connection_state != GST_DTLS_CONNECTION_STATE_CLOSED
&& self->priv->connection_state != && self->priv->connection_state !=