mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

srt: re-enable passphrase

Browse source 
With refactoring, supporting passphrase was removed accidently.
This commit re-enables srt encryption and validates 'passphrase'
by checking the return value of 'srt_setsockopt'.

fix: #694
This commit is contained in:
Justin Kim 2019-01-25 16:25:10 +09:00 committed by Olivier Crête
parent f1d5f1faab
commit e8fd000af0
3 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/srt/gstsrt-enums.h
View file

@ -45,22 +45,22 @@ typedef enum
/** /**
* GstSRTKeyLengthBits: * GstSRTKeyLengthBits:
* @GST_SRT_KEY_LENGTH_BITS_NO_KEY: no encryption * @GST_SRT_KEY_LENGTH_NO_KEY: no encryption
* @GST_SRT_KEY_LENGTH_BITS_0: no encryption * @GST_SRT_KEY_LENGTH_0: no encryption
* @GST_SRT_KEY_LENGTH_BITS_128: 128-bit length * @GST_SRT_KEY_LENGTH_16: 16 bytes (128-bit) length
* @GST_SRT_KEY_LENGTH_BITS_192: 192-bit length * @GST_SRT_KEY_LENGTH_24: 24 bytes (192-bit) length
* @GST_SRT_KEY_LENGTH_BITS_256: 256-bit length * @GST_SRT_KEY_LENGTH_32: 32 bytes (256-bit) length
* *
* Crypto key length in bits * Crypto key length in bits
*/ */
typedef enum typedef enum
{ {
GST_SRT_KEY_LENGTH_BITS_NO_KEY = 0, GST_SRT_KEY_LENGTH_NO_KEY = 0,
GST_SRT_KEY_LENGTH_BITS_0 = GST_SRT_KEY_LENGTH_BITS_NO_KEY, GST_SRT_KEY_LENGTH_0 = GST_SRT_KEY_LENGTH_NO_KEY,
GST_SRT_KEY_LENGTH_BITS_128 = 128, GST_SRT_KEY_LENGTH_16 = 16,
GST_SRT_KEY_LENGTH_BITS_192 = 192, GST_SRT_KEY_LENGTH_24 = 24,
GST_SRT_KEY_LENGTH_BITS_256 = 256, GST_SRT_KEY_LENGTH_32 = 32,
} GstSRTKeyLengthBits; } GstSRTKeyLength;
G_END_DECLS G_END_DECLS

47
ext/srt/gstsrtobject.c
View file

@ -122,7 +122,8 @@ static struct srt_constant_params srt_params[] = {
static gint srt_init_refcount = 0; static gint srt_init_refcount = 0;
static gboolean static gboolean
gst_srt_object_set_default_params (SRTSOCKET sock, GError ** error) gst_srt_object_set_common_params (SRTSOCKET sock, GstSRTObject * srtobject,
GError ** error)
{ {
struct srt_constant_params *params = srt_params; struct srt_constant_params *params = srt_params;
@ -135,6 +136,28 @@ gst_srt_object_set_default_params (SRTSOCKET sock, GError ** error)
} }
} }
if (srtobject->passphrase != NULL && srtobject->passphrase[0] != '\0') {
gint pbkeylen;
if (srt_setsockopt (sock, 0, SRTO_PASSPHRASE, srtobject->passphrase,
strlen (srtobject->passphrase))) {
g_set_error (error, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_SETTINGS,
"failed to set passphrase (reason: %s)", srt_getlasterror_str ());
return FALSE;
}
if (!gst_structure_get_int (srtobject->parameters, "pbkeylen", &pbkeylen)) {
pbkeylen = GST_SRT_DEFAULT_PBKEYLEN;
}
if (srt_setsockopt (sock, 0, SRTO_PBKEYLEN, &pbkeylen, sizeof (int))) {
g_set_error (error, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_SETTINGS,
"failed to set pbkeylen (reason: %s)", srt_getlasterror_str ());
return FALSE;
}
}
return TRUE; return TRUE;
} }
@ -187,6 +210,8 @@ gst_srt_object_destroy (GstSRTObject * srtobject)
GST_DEBUG_OBJECT (srtobject->element, "Destroying srtobject"); GST_DEBUG_OBJECT (srtobject->element, "Destroying srtobject");
gst_structure_free (srtobject->parameters); gst_structure_free (srtobject->parameters);
g_free (srtobject->passphrase);
if (g_atomic_int_dec_and_test (&srt_init_refcount)) { if (g_atomic_int_dec_and_test (&srt_init_refcount)) {
srt_cleanup (); srt_cleanup ();
GST_DEBUG_OBJECT (srtobject->element, "Cleaning up SRT"); GST_DEBUG_OBJECT (srtobject->element, "Cleaning up SRT");
@ -225,7 +250,8 @@ gst_srt_object_set_property_helper (GstSRTObject * srtobject,
gst_structure_set_value (srtobject->parameters, "localport", value); gst_structure_set_value (srtobject->parameters, "localport", value);
break; break;
case PROP_PASSPHRASE: case PROP_PASSPHRASE:
gst_structure_set_value (srtobject->parameters, "passphrase", value); g_free (srtobject->passphrase);
srtobject->passphrase = g_value_dup_string (value);
break; break;
case PROP_PBKEYLEN: case PROP_PBKEYLEN:
gst_structure_set_value (srtobject->parameters, "pbkeylen", value); gst_structure_set_value (srtobject->parameters, "pbkeylen", value);
@ -268,11 +294,11 @@ gst_srt_object_get_property_helper (GstSRTObject * srtobject,
break; break;
} }
case PROP_PBKEYLEN:{ case PROP_PBKEYLEN:{
GstSRTKeyLengthBits v; GstSRTKeyLength v;
if (!gst_structure_get_enum (srtobject->parameters, "pbkeylen", if (!gst_structure_get_enum (srtobject->parameters, "pbkeylen",
GST_TYPE_SRT_KEY_LENGTH_BITS, (gint *) & v)) { GST_TYPE_SRT_KEY_LENGTH, (gint *) & v)) {
GST_WARNING_OBJECT (srtobject->element, "Failed to get 'pbkeylen'"); GST_WARNING_OBJECT (srtobject->element, "Failed to get 'pbkeylen'");
v = GST_SRT_KEY_LENGTH_BITS_NO_KEY; v = GST_SRT_KEY_LENGTH_NO_KEY;
} }
g_value_set_enum (value, v); g_value_set_enum (value, v);
break; break;
@ -386,7 +412,7 @@ gst_srt_object_install_properties_helper (GObjectClass * gobject_class)
*/ */
g_object_class_install_property (gobject_class, PROP_PBKEYLEN, g_object_class_install_property (gobject_class, PROP_PBKEYLEN,
g_param_spec_enum ("pbkeylen", "Crypto key length", g_param_spec_enum ("pbkeylen", "Crypto key length",
"Crypto key length in bits", GST_TYPE_SRT_KEY_LENGTH_BITS, "Crypto key length in bytes", GST_TYPE_SRT_KEY_LENGTH,
GST_SRT_DEFAULT_PBKEYLEN, GST_SRT_DEFAULT_PBKEYLEN,
G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS));
@ -564,10 +590,11 @@ gst_srt_object_set_uri (GstSRTObject * srtobject, const gchar * uri,
} else if (!g_strcmp0 ("localport", key)) { } else if (!g_strcmp0 ("localport", key)) {
gst_srt_object_set_uint_value (srtobject->parameters, key, value); gst_srt_object_set_uint_value (srtobject->parameters, key, value);
} else if (!g_strcmp0 ("passphrase", key)) { } else if (!g_strcmp0 ("passphrase", key)) {
gst_srt_object_set_string_value (srtobject->parameters, key, value); g_free (srtobject->passphrase);
srtobject->passphrase = g_strdup (value);
} else if (!g_strcmp0 ("pbkeylen", key)) { } else if (!g_strcmp0 ("pbkeylen", key)) {
gst_srt_object_set_enum_value (srtobject->parameters, gst_srt_object_set_enum_value (srtobject->parameters,
GST_TYPE_SRT_KEY_LENGTH_BITS, key, value); GST_TYPE_SRT_KEY_LENGTH, key, value);
} }
} }
@ -719,7 +746,7 @@ gst_srt_object_wait_connect (GstSRTObject * srtobject,
goto failed; goto failed;
} }
if (!gst_srt_object_set_default_params (sock, error)) { if (!gst_srt_object_set_common_params (sock, srtobject, error)) {
goto failed; goto failed;
} }
@ -806,7 +833,7 @@ gst_srt_object_connect (GstSRTObject * srtobject,
goto failed; goto failed;
} }
if (!gst_srt_object_set_default_params (sock, error)) { if (!gst_srt_object_set_common_params (sock, srtobject, error)) {
goto failed; goto failed;
} }

5
ext/srt/gstsrtobject.h
View file

@ -37,11 +37,10 @@ G_BEGIN_DECLS
#define GST_SRT_DEFAULT_URI GST_SRT_DEFAULT_URI_SCHEME"://"GST_SRT_DEFAULT_HOST":"G_STRINGIFY(GST_SRT_DEFAULT_PORT) #define GST_SRT_DEFAULT_URI GST_SRT_DEFAULT_URI_SCHEME"://"GST_SRT_DEFAULT_HOST":"G_STRINGIFY(GST_SRT_DEFAULT_PORT)
#define GST_SRT_DEFAULT_MODE GST_SRT_CONNECTION_MODE_CALLER #define GST_SRT_DEFAULT_MODE GST_SRT_CONNECTION_MODE_CALLER
#define GST_SRT_DEFAULT_PBKEYLEN GST_SRT_KEY_LENGTH_BITS_128 #define GST_SRT_DEFAULT_PBKEYLEN GST_SRT_KEY_LENGTH_0
#define GST_SRT_DEFAULT_POLL_TIMEOUT -1 #define GST_SRT_DEFAULT_POLL_TIMEOUT -1
#define GST_SRT_DEFAULT_LATENCY 125 #define GST_SRT_DEFAULT_LATENCY 125
#define GST_SRT_DEFAULT_MSG_SIZE 1316 #define GST_SRT_DEFAULT_MSG_SIZE 1316
#define GST_SRT_DEFAULT_KEY_LENGTH 16
typedef struct _GstSRTObject GstSRTObject; typedef struct _GstSRTObject GstSRTObject;
@ -72,6 +71,8 @@ struct _GstSRTObject
GClosure *caller_added_closure; GClosure *caller_added_closure;
GClosure *caller_removed_closure; GClosure *caller_removed_closure;
gchar *passphrase;
}; };