mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-10 00:12:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspsrc: update for new MIKEY API

Browse source
This commit is contained in:
Wim Taymans 2014-04-04 17:38:14 +02:00
parent 6210cbe1e2
commit 5b9945e0a6
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/rtsp/gstrtspsrc.c
View file

@ -1705,7 +1705,7 @@ parse_keymgmt (const gchar * keymgmt, GstCaps * caps)
if (data == NULL) if (data == NULL)
return FALSE; return FALSE;
msg = gst_mikey_message_new_from_data (data, size); msg = gst_mikey_message_new_from_data (data, size, NULL, NULL);
if (msg == NULL) if (msg == NULL)
return FALSE; return FALSE;
@ -1766,13 +1766,23 @@ parse_keymgmt (const gchar * keymgmt, GstCaps * caps)
goto done; goto done;
else { else {
GstMIKEYPayloadKEMAC *p = (GstMIKEYPayloadKEMAC *) payload; GstMIKEYPayloadKEMAC *p = (GstMIKEYPayloadKEMAC *) payload;
const GstMIKEYPayload *sub;
GstMIKEYPayloadKeyData *pkd;
GstBuffer *buf; GstBuffer *buf;
if (p->enc_alg != GST_MIKEY_ENC_NULL || p->mac_alg != GST_MIKEY_MAC_NULL) if (p->enc_alg != GST_MIKEY_ENC_NULL || p->mac_alg != GST_MIKEY_MAC_NULL)
goto done; goto done;
if (!(sub = gst_mikey_payload_kemac_get_sub (payload, 0)))
goto done;
if (sub->type != GST_MIKEY_PT_KEY_DATA)
goto done;
pkd = (GstMIKEYPayloadKeyData *) sub;
buf = buf =
gst_buffer_new_wrapped (g_memdup (p->enc_data, p->enc_len), p->enc_len); gst_buffer_new_wrapped (g_memdup (pkd->key_data, pkd->key_len),
pkd->key_len);
gst_caps_set_simple (caps, "srtp-key", GST_TYPE_BUFFER, buf, NULL); gst_caps_set_simple (caps, "srtp-key", GST_TYPE_BUFFER, buf, NULL);
} }
@ -5814,7 +5824,7 @@ gst_rtspsrc_stream_make_keymgmt (GstRTSPSrc * src, GstRTSPStream * stream)
gsize size; gsize size;
guint i; guint i;
GstMIKEYMessage *msg; GstMIKEYMessage *msg;
GstMIKEYPayload *payload; GstMIKEYPayload *payload, *pkd;
guint8 byte; guint8 byte;
#define KEY_SIZE 30 #define KEY_SIZE 30
@ -5858,12 +5868,18 @@ gst_rtspsrc_stream_make_keymgmt (GstRTSPSrc * src, GstRTSPStream * stream)
&byte); &byte);
gst_mikey_message_add_payload (msg, payload); gst_mikey_message_add_payload (msg, payload);
/* make unencrypted KEMAC */
payload = gst_mikey_payload_new (GST_MIKEY_PT_KEMAC);
gst_mikey_payload_kemac_set (payload, GST_MIKEY_ENC_NULL, GST_MIKEY_MAC_NULL);
/* add the key in KEMAC */ /* add the key in KEMAC */
gst_mikey_message_add_kemac (msg, GST_MIKEY_ENC_NULL, KEY_SIZE, key_data, pkd = gst_mikey_payload_new (GST_MIKEY_PT_KEY_DATA);
GST_MIKEY_MAC_NULL, NULL); gst_mikey_payload_key_data_set_key (pkd, GST_MIKEY_KD_TEK, KEY_SIZE,
key_data);
gst_mikey_payload_kemac_add_sub (payload, pkd);
gst_mikey_message_add_payload (msg, payload);
/* now serialize this to bytes */ /* now serialize this to bytes */
bytes = gst_mikey_message_to_bytes (msg); bytes = gst_mikey_message_to_bytes (msg, NULL, NULL);
gst_mikey_message_free (msg); gst_mikey_message_free (msg);
/* and make it into base64 */ /* and make it into base64 */
data = g_bytes_get_data (bytes, &size); data = g_bytes_get_data (bytes, &size);