thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation without implicit nlohmann conversions

Browse source
This commit is contained in:
Nicolas Werner 2022-06-17 03:11:31 +02:00
parent 28acea55e2
commit ef941920ea
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
10 changed files with 86 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/encryption/DeviceVerificationFlow.cpp
View file

@ -270,7 +270,8 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
json j = their_keys.master_keys;
j.erase("signatures");
j.erase("unsigned");
mtx::crypto::CrossSigningKeys master_key = j;
mtx::crypto::CrossSigningKeys master_key =
j.get<mtx::crypto::CrossSigningKeys>();
master_key.signatures[utils::localUser().toStdString()]
["ed25519:" + http::client()->device_id()] =
olm::client()->sign_message(j.dump());
@ -292,7 +293,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
continue;
auto ssk = mtx::crypto::PkSigning::from_seed(*secret);
mtx::crypto::DeviceKeys dev = j;
mtx::crypto::DeviceKeys dev = j.get<mtx::crypto::DeviceKeys>();
dev.signatures[utils::localUser().toStdString()]
["ed25519:" + ssk.public_key()] = ssk.sign(j.dump());
@ -314,7 +315,8 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
continue;
auto usk = mtx::crypto::PkSigning::from_seed(*secret);
mtx::crypto::CrossSigningKeys master_key = j;
mtx::crypto::CrossSigningKeys master_key =
j.get<mtx::crypto::CrossSigningKeys>();
master_key.signatures[utils::localUser().toStdString()]
["ed25519:" + usk.public_key()] = usk.sign(j.dump());