diff options
| author | George Hazan <ghazan@miranda.im> | 2020-02-17 18:00:46 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-02-17 18:00:54 +0300 |
| commit | 73769ed8b0004dd35a33fdf75d3186f557cb60f3 (patch) | |
| tree | 245743897e5d0301fcd4c2f0305c012d21efbdbb /protocols/JabberG/src/jabber_omemo.cpp | |
| parent | 554555b0d5de320c02a272caeccf8a419c1f62a8 (diff) | |
code cleaning
Diffstat (limited to 'protocols/JabberG/src/jabber_omemo.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_omemo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp index 115f468f05..66e0284f72 100755 --- a/protocols/JabberG/src/jabber_omemo.cpp +++ b/protocols/JabberG/src/jabber_omemo.cpp @@ -2097,7 +2097,7 @@ void CJabberProto::OmemoOnIqResultGetBundle(const TiXmlElement *iqNode, CJabberI OmemoCheckSession(hContact);
}
-unsigned int CJabberProto::OmemoEncryptMessage(XmlNode &msg, const char *msg_text, MCONTACT hContact)
+int CJabberProto::OmemoEncryptMessage(XmlNode &msg, const char *msg_text, MCONTACT hContact)
{
const EVP_CIPHER *cipher = EVP_aes_128_gcm();
unsigned char key[16], iv[12], tag[16] /*, aad[48]*/;
@@ -2131,7 +2131,7 @@ unsigned int CJabberProto::OmemoEncryptMessage(XmlNode &msg, const char *msg_tex TiXmlElement *header = encrypted << XCHILD("header");
header << XATTRI64("sid", m_omemo.GetOwnDeviceId());
- unsigned int session_count = 0;
+ int session_count = 0;
char key_plus_tag[32] = { 0 };
memcpy(key_plus_tag, key, 16);
{
|