anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix bug in legacy SRTP decryption

Browse source
This commit is contained in:
Marvin W 2021-04-01 11:51:35 +02:00
parent c5cb43350a
commit c5ab4fed87
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/rtp/src/stream.vala
View file

@ -279,7 +279,7 @@ public class Dino.Plugins.Rtp.Stream : Xmpp.Xep.JingleRtp.Stream {
} }
private void prepare_remote_crypto() { private void prepare_remote_crypto() {
if (remote_crypto != null && crypto_session.has_decrypt) { if (remote_crypto != null && !crypto_session.has_decrypt) {
crypto_session.set_decryption_key(remote_crypto.crypto_suite, remote_crypto.key, remote_crypto.salt); crypto_session.set_decryption_key(remote_crypto.crypto_suite, remote_crypto.key, remote_crypto.salt);
debug("Setting up decryption with key params %s", remote_crypto.key_params); debug("Setting up decryption with key params %s", remote_crypto.key_params);
} }
@ -339,6 +339,11 @@ public class Dino.Plugins.Rtp.Stream : Xmpp.Xep.JingleRtp.Stream {
} }
public void on_ssrc_pad_added(string ssrc, Gst.Pad pad) { public void on_ssrc_pad_added(string ssrc, Gst.Pad pad) {
debug("New ssrc %s with pad %s", ssrc, pad.name);
if (participant_ssrc != null && participant_ssrc != ssrc) {
warning("Got second ssrc on stream (old: %s, new: %s), ignoring", participant_ssrc, ssrc);
return;
}
participant_ssrc = ssrc; participant_ssrc = ssrc;
recv_rtp_src_pad = pad; recv_rtp_src_pad = pad;
if (decode != null) { if (decode != null) {