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

Fix SSSS unlock without a password set

Browse source 
fixes #657
This commit is contained in:
Nicolas Werner 2021-07-25 12:13:24 +02:00
parent d55f7ea12b
commit f4e670d8d5
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ChatPage.cpp
View file

@ -1028,8 +1028,15 @@ ChatPage::decryptDownloadedSecrets(mtx::secret_storage::AesHmacSha2KeyDescriptio
auto decryptionKey = mtx::crypto::key_from_recoverykey(text.toStdString(), keyDesc); auto decryptionKey = mtx::crypto::key_from_recoverykey(text.toStdString(), keyDesc);
if (!decryptionKey) if (!decryptionKey && keyDesc.passphrase) {
decryptionKey = mtx::crypto::key_from_passphrase(text.toStdString(), keyDesc); try {
decryptionKey =
mtx::crypto::key_from_passphrase(text.toStdString(), keyDesc);
} catch (std::exception &e) {
nhlog::crypto()->error("Failed to derive secret key from passphrase: {}",
e.what());
}
}
if (!decryptionKey) { if (!decryptionKey) {
QMessageBox::information( QMessageBox::information(