aboutsummaryrefslogtreecommitdiff
path: root/xmpp-vala/src
diff options
context:
space:
mode:
Diffstat (limited to 'xmpp-vala/src')
-rw-r--r--xmpp-vala/src/module/xep/0166_jingle/content.vala15
-rw-r--r--xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala2
2 files changed, 12 insertions, 5 deletions
diff --git a/xmpp-vala/src/module/xep/0166_jingle/content.vala b/xmpp-vala/src/module/xep/0166_jingle/content.vala
index be78c91a..b51bb26d 100644
--- a/xmpp-vala/src/module/xep/0166_jingle/content.vala
+++ b/xmpp-vala/src/module/xep/0166_jingle/content.vala
@@ -238,8 +238,15 @@ public class Xmpp.Xep.Jingle.Content : Object {
}
public class Xmpp.Xep.Jingle.ContentEncryption : Object {
- public string encryption_ns { get; set; }
- public string encryption_name { get; set; }
- public uint8[] our_key { get; set; }
- public uint8[] peer_key { get; set; }
+ public string encryption_ns;
+ public string encryption_name;
+ public uint8[] our_key;
+ public uint8[] peer_key;
+
+ public class ContentEncryption(string encryption_ns, string encryption_name, uint8[] our_key = new uint8[]{}, uint8[] peer_key = new uint8[]{}) {
+ this.encryption_ns = encryption_ns;
+ this.encryption_name = encryption_name;
+ this.our_key = our_key;
+ this.peer_key = peer_key;
+ }
} \ No newline at end of file
diff --git a/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala b/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala
index 344fe8b8..eadc1c8b 100644
--- a/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala
+++ b/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala
@@ -133,7 +133,7 @@ public class Xmpp.Xep.JingleRtp.Parameters : Jingle.ContentParameters, Object {
local_crypto = null;
}
if (remote_crypto != null && local_crypto != null) {
- var content_encryption = new Xmpp.Xep.Jingle.ContentEncryption() { encryption_ns = "", encryption_name = "SRTP", our_key=local_crypto.key, peer_key=remote_crypto.key };
+ var content_encryption = new Xmpp.Xep.Jingle.ContentEncryption("", "SRTP", local_crypto.key, remote_crypto.key);
content.encryptions[content_encryption.encryption_name] = content_encryption;
}