mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-20 02:00:55 +07:00
fix: restoring from encrypted backup
This commit is contained in:
@@ -18,12 +18,10 @@
|
||||
namespace
|
||||
{
|
||||
constexpr int SALT_LEN = 16;
|
||||
constexpr int IV_LEN = 16;
|
||||
constexpr int IV_LEN = 12;
|
||||
constexpr int KEY_LEN = 32;
|
||||
constexpr int PBKDF2_ITER = 100000;
|
||||
|
||||
constexpr int IV_LEN_GCM = 16;
|
||||
constexpr int TAG_LEN = 16;
|
||||
constexpr int PBKDF2_ITER = 100000;
|
||||
|
||||
const QByteArray magicString { "EncData" };
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ PageType {
|
||||
qsTr("Backup files (*.backup)"))
|
||||
if (filePath !== "") {
|
||||
passwordDrawer.fileName = filePath
|
||||
SystemController.isFileEncrypted(filePath) ? passwordDrawer.openTriggered() : restoreBackup(filePath)
|
||||
SystemController.isFileEncrypted(filePath) ? passwordDrawer.restoreSecuredBackup() : restoreBackup(filePath)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -163,10 +163,6 @@ PageType {
|
||||
|
||||
anchors.fill: parent
|
||||
expandedHeight: root.height * 0.45
|
||||
|
||||
securedFunc: function() {
|
||||
passwordDrawer.restoreSecuredBackup()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user