aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2021-04-29 15:56:22 +0200
committerfiaxh <git@lightrise.org>2021-05-01 21:51:24 +0200
commit7d2e64769067c1b47e0500f6456dd7e6f4eb435a (patch)
tree0405bd7728c57928bb3c202f684ae85bb7494ffc /plugins
parent0409f554268c0e8f24e23e471a94de4d3a035ff1 (diff)
downloaddino-7d2e64769067c1b47e0500f6456dd7e6f4eb435a.tar.gz
dino-7d2e64769067c1b47e0500f6456dd7e6f4eb435a.zip
Improve call wording, cleanup
Diffstat (limited to 'plugins')
-rw-r--r--plugins/omemo/src/dtls_srtp_verification_draft.vala1
-rw-r--r--plugins/rtp/src/module.vala12
-rw-r--r--plugins/rtp/src/stream.vala4
3 files changed, 8 insertions, 9 deletions
diff --git a/plugins/omemo/src/dtls_srtp_verification_draft.vala b/plugins/omemo/src/dtls_srtp_verification_draft.vala
index e2441670..66a31954 100644
--- a/plugins/omemo/src/dtls_srtp_verification_draft.vala
+++ b/plugins/omemo/src/dtls_srtp_verification_draft.vala
@@ -65,7 +65,6 @@ namespace Dino.Plugins.Omemo.DtlsSrtpVerificationDraft {
stream.get_flag(Xep.Jingle.Flag.IDENTITY).get_session.begin(jingle_sid, (_, res) => {
Xep.Jingle.Session? session = stream.get_flag(Xep.Jingle.Flag.IDENTITY).get_session.end(res);
- if (session != null) print(@"$(session.contents_map.has_key(content_name))\n");
if (session == null || !session.contents_map.has_key(content_name)) return;
var encryption = new OmemoContentEncryption() { encryption_ns=NS_URI, encryption_name="OMEMO", our_key=new uint8[0], peer_key=new uint8[0], peer_device_id=device_id_by_jingle_sid[jingle_sid] };
session.contents_map[content_name].encryptions[NS_URI] = encryption;
diff --git a/plugins/rtp/src/module.vala b/plugins/rtp/src/module.vala
index 13a21cd8..19a7501d 100644
--- a/plugins/rtp/src/module.vala
+++ b/plugins/rtp/src/module.vala
@@ -216,9 +216,9 @@ public class Dino.Plugins.Rtp.Module : JingleRtp.Module {
}
public override JingleRtp.Crypto? generate_local_crypto() {
- uint8[] keyAndSalt = new uint8[30];
- Crypto.randomize(keyAndSalt);
- return JingleRtp.Crypto.create(JingleRtp.Crypto.AES_CM_128_HMAC_SHA1_80, keyAndSalt);
+ uint8[] key_and_salt = new uint8[30];
+ Crypto.randomize(key_and_salt);
+ return JingleRtp.Crypto.create(JingleRtp.Crypto.AES_CM_128_HMAC_SHA1_80, key_and_salt);
}
public override JingleRtp.Crypto? pick_remote_crypto(Gee.List<JingleRtp.Crypto> cryptos) {
@@ -230,8 +230,8 @@ public class Dino.Plugins.Rtp.Module : JingleRtp.Module {
public override JingleRtp.Crypto? pick_local_crypto(JingleRtp.Crypto? remote) {
if (remote == null || !remote.is_valid) return null;
- uint8[] keyAndSalt = new uint8[30];
- Crypto.randomize(keyAndSalt);
- return remote.rekey(keyAndSalt);
+ uint8[] key_and_salt = new uint8[30];
+ Crypto.randomize(key_and_salt);
+ return remote.rekey(key_and_salt);
}
} \ No newline at end of file
diff --git a/plugins/rtp/src/stream.vala b/plugins/rtp/src/stream.vala
index 23634aa3..bd8a279f 100644
--- a/plugins/rtp/src/stream.vala
+++ b/plugins/rtp/src/stream.vala
@@ -256,7 +256,7 @@ public class Dino.Plugins.Rtp.Stream : Xmpp.Xep.JingleRtp.Stream {
}
private void prepare_local_crypto() {
- if (local_crypto != null && !crypto_session.has_encrypt) {
+ if (local_crypto != null && local_crypto.is_valid && !crypto_session.has_encrypt) {
crypto_session.set_encryption_key(local_crypto.crypto_suite, local_crypto.key, local_crypto.salt);
debug("Setting up encryption with key params %s", local_crypto.key_params);
}
@@ -396,7 +396,7 @@ public class Dino.Plugins.Rtp.Stream : Xmpp.Xep.JingleRtp.Stream {
}
private void prepare_remote_crypto() {
- if (remote_crypto != null && !crypto_session.has_decrypt) {
+ if (remote_crypto != null && remote_crypto.is_valid && !crypto_session.has_decrypt) {
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);
}