summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_proto.h
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-05-02 13:24:46 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-05-02 13:42:05 +0300
commitc4581462777ec3faf67e0075762c37648a5051b3 (patch)
tree492021c23183fd568c1726b632a003675a76fc0f /protocols/JabberG/src/jabber_proto.h
parent7e9fed6f96da5954b8e1d65d51c6bb89c552ff16 (diff)
jabber: omemo: basic implementation done
omemo now works, done basic testing with miranda<>miranda but not ready for use, incompatible with gajim (due to upstream regression in libsignal ?, or some my own bugs), storage backend still missing few functions (which is crutical in some situations) fixed crash in libsignal-c crypto backend implementation few small changes in aes-gcm encrypt/decrypt implementation (auth tag verification still fails), but decryption looks ok more strict type check for device id to avoid overflow (it must be 4byte size unsigned integer) finished basic implementation of 4.7 4.5 return error and does not send anything if no sessions available
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.h')
-rwxr-xr-xprotocols/JabberG/src/jabber_proto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 3b164a37d1..9606544a22 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -337,14 +337,14 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
void DeleteMucListItem(JABBER_MUC_JIDLIST_INFO* jidListInfo, const wchar_t* jid);
//---- jabber_omemo.cpp --------------------------------------------------------------
- void OmemoHandleMessage(HXML node, MCONTACT hContact);
+ void OmemoHandleMessage(HXML node, LPCTSTR jid, time_t msgTime);
void OmemoHandleDeviceList(HXML node);
void OmemoInitDevice();
void OmemoAnnounceDevice();
void OmemoSendBundle();
void OmemoPublishNodes();
bool OmemoCheckSession(MCONTACT hContact);
- void OmemoEncryptMessage(XmlNode &msg, const wchar_t *msg_text, MCONTACT hContact);
+ unsigned int OmemoEncryptMessage(XmlNode &msg, const wchar_t *msg_text, MCONTACT hContact);
bool OmemoIsEnabled(MCONTACT hContact);
void OmemoOnIqResultGetBundle(HXML iqNode, CJabberIqInfo *pInfo);