diff options
| author | George Hazan <ghazan@miranda.im> | 2022-10-17 17:37:00 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-10-17 17:37:00 +0300 |
| commit | 412bf82cd0d386516a74d83e5b02eb944f8e2012 (patch) | |
| tree | 1eef31cad478b592d621e24af95a4946cee8cdb6 /protocols/WhatsAppWeb | |
| parent | 6bd2db21b89b2fb7bdc06a26fa26bd886de3fa33 (diff) | |
WhatsApp: fix for decoding messages
Diffstat (limited to 'protocols/WhatsAppWeb')
| -rw-r--r-- | protocols/WhatsAppWeb/src/signal.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/WhatsAppWeb/src/signal.cpp b/protocols/WhatsAppWeb/src/signal.cpp index 14f09d20ef..1e089ea6c0 100644 --- a/protocols/WhatsAppWeb/src/signal.cpp +++ b/protocols/WhatsAppWeb/src/signal.cpp @@ -274,10 +274,10 @@ static int get_identity_key_pair(signal_buffer **public_data, signal_buffer **pr MBinBuffer buf; buf.append(KEY_BUNDLE_TYPE, 1); - buf.append(pStore->preKey.pub); + buf.append(pStore->signedIdentity.pub); *public_data = signal_buffer_create(buf.data(), (int)buf.length()); - *private_data = signal_buffer_create((uint8_t *)pStore->preKey.priv.data(), (int)pStore->preKey.priv.length()); + *private_data = signal_buffer_create((uint8_t *)pStore->signedIdentity.priv.data(), (int)pStore->signedIdentity.priv.length()); return 0; } @@ -426,7 +426,7 @@ CMStringA MSignalSession::getSetting(const MSignalStore *pStore) const ///////////////////////////////////////////////////////////////////////////////////////// -MSignalSession *MSignalStore::createSession(const CMStringA &szName, int deviceId) +MSignalSession* MSignalStore::createSession(const CMStringA &szName, int deviceId) { MSignalSession tmp(szName, deviceId); auto *pSession = arSessions.find(&tmp); @@ -455,7 +455,7 @@ MBinBuffer MSignalStore::decryptSignalProto(const CMStringA &from, const char *p if (pre_key_signal_message_deserialize(&pMsg, (BYTE *)encrypted.data(), encrypted.length(), m_pContext) < 0) throw "unable to deserialize prekey message"; - if (session_cipher_decrypt_pre_key_signal_message(pSession->getCipher(), pMsg, 0, &result) < 0) + if (session_cipher_decrypt_pre_key_signal_message(pSession->getCipher(), pMsg, this, &result) < 0) throw "unable to decrypt prekey message"; pre_key_signal_message_destroy((signal_type_base*)pMsg); @@ -465,7 +465,7 @@ MBinBuffer MSignalStore::decryptSignalProto(const CMStringA &from, const char *p if (signal_message_deserialize(&pMsg, (BYTE *)encrypted.data(), encrypted.length(), m_pContext) < 0) throw "unable to deserialize signal message"; - if (session_cipher_decrypt_signal_message(pSession->getCipher(), pMsg, 0, &result) < 0) + if (session_cipher_decrypt_signal_message(pSession->getCipher(), pMsg, this, &result) < 0) throw "unable to decrypt signal message"; signal_message_destroy((signal_type_base *)pMsg); @@ -479,7 +479,7 @@ MBinBuffer MSignalStore::decryptSignalProto(const CMStringA &from, const char *p return ret; } -MBinBuffer MSignalStore::decryptGroupSignalProto(const CMStringA &from, const CMStringA &author, const MBinBuffer &encrypted) +MBinBuffer MSignalStore::decryptGroupSignalProto(const CMStringA &group, const CMStringA &sender, const MBinBuffer &encrypted) { MBinBuffer ret; return ret; |