d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update mtxclient

Browse source
This commit is contained in:
Konstantinos Sideris 2018-09-15 00:40:16 +03:00
parent 8767ea181d
commit cf71a5858c
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deps/CMakeLists.txt vendored
View file

@ -39,10 +39,10 @@ set(BOOST_SHA256
set( set(
MTXCLIENT_URL MTXCLIENT_URL
https://github.com/mujx/mtxclient/archive/1a539721ec86cb8b5f9d0b51cbe2251e46257a9b.tar.gz https://github.com/mujx/mtxclient/archive/3328fdedcb7db0a0bd2921189193504bf3b0c3aa.tar.gz
) )
set(MTXCLIENT_HASH set(MTXCLIENT_HASH
7c458f57f774c75afaf403869e57a753620b5b619b1a7cd0b63bbc4735fc8993) 10a60158669001c6367a163b21a251a4e098ee9e3d12c5190104e9940639dc9f)
set( set(
TWEENY_URL TWEENY_URL

15
src/Olm.cpp
View file

@ -7,8 +7,6 @@
#include "MatrixClient.h" #include "MatrixClient.h"
#include "Utils.h" #include "Utils.h"
using namespace mtx::crypto;
static const std::string STORAGE_SECRET_KEY("secret"); static const std::string STORAGE_SECRET_KEY("secret");
constexpr auto MEGOLM_ALGO = "m.megolm.v1.aes-sha2"; constexpr auto MEGOLM_ALGO = "m.megolm.v1.aes-sha2";
@ -116,7 +114,7 @@ handle_pre_key_olm_message(const std::string &sender,
{ {
nhlog::crypto()->info("opening olm session with {}", sender); nhlog::crypto()->info("opening olm session with {}", sender);
OlmSessionPtr inbound_session = nullptr; mtx::crypto::OlmSessionPtr inbound_session = nullptr;
try { try {
inbound_session = inbound_session =
olm::client()->create_inbound_session_from(sender_key, content.body); olm::client()->create_inbound_session_from(sender_key, content.body);
@ -124,13 +122,14 @@ handle_pre_key_olm_message(const std::string &sender,
// We also remove the one time key used to establish that // We also remove the one time key used to establish that
// session so we'll have to update our copy of the account object. // session so we'll have to update our copy of the account object.
cache::client()->saveOlmAccount(olm::client()->save("secret")); cache::client()->saveOlmAccount(olm::client()->save("secret"));
} catch (const olm_exception &e) { } catch (const mtx::crypto::olm_exception &e) {
nhlog::crypto()->critical( nhlog::crypto()->critical(
"failed to create inbound session with {}: {}", sender, e.what()); "failed to create inbound session with {}: {}", sender, e.what());
return; return;
} }
if (!matches_inbound_session_from(inbound_session.get(), sender_key, content.body)) { if (!mtx::crypto::matches_inbound_session_from(
inbound_session.get(), sender_key, content.body)) {
nhlog::crypto()->warn("inbound olm session doesn't match sender's key ({})", nhlog::crypto()->warn("inbound olm session doesn't match sender's key ({})",
sender); sender);
return; return;
@ -140,7 +139,7 @@ handle_pre_key_olm_message(const std::string &sender,
try { try {
output = output =
olm::client()->decrypt_message(inbound_session.get(), content.type, content.body); olm::client()->decrypt_message(inbound_session.get(), content.type, content.body);
} catch (const olm_exception &e) { } catch (const mtx::crypto::olm_exception &e) {
nhlog::crypto()->critical( nhlog::crypto()->critical(
"failed to decrypt olm message {}: {}", content.body, e.what()); "failed to decrypt olm message {}: {}", content.body, e.what());
return; return;
@ -206,7 +205,7 @@ try_olm_decryption(const std::string &sender_key, const mtx::events::msg::OlmCip
try { try {
text = olm::client()->decrypt_message(session->get(), msg.type, msg.body); text = olm::client()->decrypt_message(session->get(), msg.type, msg.body);
cache::client()->saveOlmSession(id, std::move(session.value())); cache::client()->saveOlmSession(id, std::move(session.value()));
} catch (const olm_exception &e) { } catch (const mtx::crypto::olm_exception &e) {
nhlog::crypto()->info("failed to decrypt olm message ({}, {}) with {}: {}", nhlog::crypto()->info("failed to decrypt olm message ({}, {}) with {}: {}",
msg.type, msg.type,
sender_key, sender_key,
@ -257,7 +256,7 @@ create_inbound_megolm_session(const std::string &sender,
} catch (const lmdb::error &e) { } catch (const lmdb::error &e) {
nhlog::crypto()->critical("failed to save inbound megolm session: {}", e.what()); nhlog::crypto()->critical("failed to save inbound megolm session: {}", e.what());
return; return;
} catch (const olm_exception &e) { } catch (const mtx::crypto::olm_exception &e) {
nhlog::crypto()->critical("failed to create inbound megolm session: {}", e.what()); nhlog::crypto()->critical("failed to create inbound megolm session: {}", e.what());
return; return;
} }