From 28f0e7985cab9e305a32f830f974db0f049a8f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Fri, 24 Jul 2015 19:24:41 -0400 Subject: rtpstream: Accept everything when no crypto was set --- gst/fsrtpconference/fs-rtp-stream.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c index a6457d89..294a0c8f 100644 --- a/gst/fsrtpconference/fs-rtp-stream.c +++ b/gst/fsrtpconference/fs-rtp-stream.c @@ -1516,13 +1516,11 @@ fs_rtp_stream_get_srtp_caps_locked (FsRtpStream *self) const GValue *v; GstBuffer *key; - if (!self->priv->decryption_parameters) - return NULL; - /* This is always TRUE for now, but when we expand to DTLS-SRTP, it may * not be. */ - if (!gst_structure_has_name (self->priv->decryption_parameters, + if (!self->priv->decryption_parameters || + !gst_structure_has_name (self->priv->decryption_parameters, "FarstreamSRTP")) { /* Return NULL (drop packets) if encrypted, otherwise return -- cgit v1.2.1