Merge pull request #3967 from FearlessTobi/keys-singleton

crypto: Make KeyManager a singleton class
This commit is contained in:
David
2020-07-01 14:16:26 +10:00
committed by GitHub
13 changed files with 27 additions and 21 deletions

View File

@ -2226,7 +2226,7 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
"title.keys_autogenerated");
}
Core::Crypto::KeyManager keys{};
Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::instance();
if (keys.BaseDeriveNecessary()) {
Core::Crypto::PartitionDataManager pdm{vfs->OpenDirectory(
FileUtil::GetUserPath(FileUtil::UserPath::SysDataDir), FileSys::Mode::Read)};