OMEMO: Use libomemo-c instead of libsignal-protocol-c

7 files changed, 14 insertions, 14 deletions

diff --git a/plugins/omemo/src/logic/decrypt.vala b/plugins/omemo/src/logic/decrypt.vala
index 04339c93..9e5b739a 100644
--- a/plugins/omemo/src/logic/decrypt.vala
+++ b/plugins/omemo/src/logic/decrypt.vala
@@ -1,7 +1,7 @@
 using Dino.Entities;
 using Qlite;
 using Gee;
-using Signal;
+using Omemo;
 using Xmpp;
 
 namespace Dino.Plugins.Omemo {
@@ -91,7 +91,7 @@ namespace Dino.Plugins.Omemo {
                     possible_jids.add(message.real_jid.bare_jid);
                 } else if (data.is_prekey) {
                     // pre key messages do store the identity key, so we can use that to find the real jid
-                    PreKeySignalMessage msg = Plugin.get_context().deserialize_pre_key_signal_message(data.encrypted_key);
+                    PreKeyOmemoMessage msg = Plugin.get_context().deserialize_signal_pre_key_message(data.encrypted_key);
                     string identity_key = Base64.encode(msg.identity_key.serialize());
                     foreach (Row row in db.identity_meta.get_with_device_id(identity_id, data.sid).with(db.identity_meta.identity_key_public_base64, "=", identity_key)) {
                         try {
@@ -124,7 +124,7 @@ namespace Dino.Plugins.Omemo {
 
             if (data.is_prekey) {
                 int identity_id = db.identity.get_id(account.id);
-                PreKeySignalMessage msg = Plugin.get_context().deserialize_pre_key_signal_message(encrypted_key);
+                PreKeyOmemoMessage msg = Plugin.get_context().deserialize_signal_pre_key_message(encrypted_key);
                 string identity_key = Base64.encode(msg.identity_key.serialize());
 
                 bool ok = update_db_for_prekey(identity_id, identity_key, from_jid, sid);
@@ -132,13 +132,13 @@ namespace Dino.Plugins.Omemo {
 
                 debug("Starting new session for decryption with device from %s/%d", from_jid.to_string(), sid);
                 SessionCipher cipher = store.create_session_cipher(address);
-                key = cipher.decrypt_pre_key_signal_message(msg);
+                key = cipher.decrypt_pre_key_message(msg);
                 // TODO: Finish session
             } else {
                 debug("Continuing session for decryption with device from %s/%d", from_jid.to_string(), sid);
-                SignalMessage msg = Plugin.get_context().deserialize_signal_message(encrypted_key);
+                OmemoMessage msg = Plugin.get_context().deserialize_signal_message(encrypted_key);
                 SessionCipher cipher = store.create_session_cipher(address);
-                key = cipher.decrypt_signal_message(msg);
+                key = cipher.decrypt_message(msg);
             }
 
             if (key.length >= 32) {
diff --git a/plugins/omemo/src/logic/encrypt.vala b/plugins/omemo/src/logic/encrypt.vala
index cd994c3a..e5d11c69 100644
--- a/plugins/omemo/src/logic/encrypt.vala
+++ b/plugins/omemo/src/logic/encrypt.vala
@@ -1,5 +1,5 @@
 using Gee;
-using Signal;
+using Omemo;
 using Dino.Entities;
 using Xmpp;
 using Xmpp.Xep.Omemo;
@@ -59,7 +59,7 @@ namespace Dino.Plugins.Omemo {
                 message.body = "[This message is OMEMO encrypted]";
                 status.encrypted = true;
             } catch (Error e) {
-                warning(@"Signal error while encrypting message: $(e.message)\n");
+                warning(@"error while encrypting message: $(e.message)\n");
                 message.body = "[OMEMO encryption failed]";
                 status.encrypted = false;
             }
diff --git a/plugins/omemo/src/logic/manager.vala b/plugins/omemo/src/logic/manager.vala
index ba02bab5..cad6729e 100644
--- a/plugins/omemo/src/logic/manager.vala
+++ b/plugins/omemo/src/logic/manager.vala
@@ -1,5 +1,5 @@
 using Dino.Entities;
-using Signal;
+using Omemo;
 using Qlite;
 using Xmpp;
 using Gee;
@@ -361,7 +361,7 @@ public class Manager : StreamInteractionModule, Object {
             try {
                 store.identity_key_store.local_registration_id = Random.int_range(1, int32.MAX);
 
-                Signal.ECKeyPair key_pair = Plugin.get_context().generate_key_pair();
+                ECKeyPair key_pair = Plugin.get_context().generate_key_pair();
                 store.identity_key_store.identity_key_private = new Bytes(key_pair.private.serialize());
                 store.identity_key_store.identity_key_public = new Bytes(key_pair.public.serialize());
 
diff --git a/plugins/omemo/src/logic/pre_key_store.vala b/plugins/omemo/src/logic/pre_key_store.vala
index 27e5c01d..c15acc84 100644
--- a/plugins/omemo/src/logic/pre_key_store.vala
+++ b/plugins/omemo/src/logic/pre_key_store.vala
@@ -1,4 +1,4 @@
-using Signal;
+using Omemo;
 using Qlite;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/logic/session_store.vala b/plugins/omemo/src/logic/session_store.vala
index 2c7ef642..ea5738fd 100644
--- a/plugins/omemo/src/logic/session_store.vala
+++ b/plugins/omemo/src/logic/session_store.vala
@@ -1,4 +1,4 @@
-using Signal;
+using Omemo;
 using Qlite;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/logic/signed_pre_key_store.vala b/plugins/omemo/src/logic/signed_pre_key_store.vala
index 08f115c9..d73cbe71 100644
--- a/plugins/omemo/src/logic/signed_pre_key_store.vala
+++ b/plugins/omemo/src/logic/signed_pre_key_store.vala
@@ -1,5 +1,5 @@
 using Qlite;
-using Signal;
+using Omemo;
 
 namespace Dino.Plugins.Omemo {
 
diff --git a/plugins/omemo/src/logic/trust_manager.vala b/plugins/omemo/src/logic/trust_manager.vala
index cae88eef..8cf1ddeb 100644
--- a/plugins/omemo/src/logic/trust_manager.vala
+++ b/plugins/omemo/src/logic/trust_manager.vala
@@ -1,7 +1,7 @@
 using Dino.Entities;
 using Gee;
 using Xmpp;
-using Signal;
+using Omemo;
 using Qlite;
 
 namespace Dino.Plugins.Omemo {