diff options
Diffstat (limited to 'src/core/crypto/key_manager.cpp')
| -rw-r--r-- | src/core/crypto/key_manager.cpp | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 50945eee91..353274d77b 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -640,32 +640,20 @@ KeyManager::KeyManager() { void KeyManager::ReloadKeys() { // Initialize keys - const auto yuzu_keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir); - - if (!Common::FS::CreateDir(yuzu_keys_dir)) { + const auto keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir); + if (!Common::FS::CreateDir(keys_dir)) LOG_ERROR(Core, "Failed to create the keys directory."); - } - - if (Settings::values.use_dev_keys) { - dev_mode = true; - LoadFromFile(yuzu_keys_dir / "dev.keys_autogenerated", false); - LoadFromFile(yuzu_keys_dir / "dev.keys", false); - } else { - dev_mode = false; - LoadFromFile(yuzu_keys_dir / "prod.keys_autogenerated", false); - LoadFromFile(yuzu_keys_dir / "prod.keys", false); - } - - LoadFromFile(yuzu_keys_dir / "title.keys_autogenerated", true); - LoadFromFile(yuzu_keys_dir / "title.keys", true); - LoadFromFile(yuzu_keys_dir / "console.keys_autogenerated", false); - LoadFromFile(yuzu_keys_dir / "console.keys", false); + LoadFromFile(keys_dir / "prod.keys_autogenerated", false); + LoadFromFile(keys_dir / "prod.keys", false); + LoadFromFile(keys_dir / "title.keys_autogenerated", true); + LoadFromFile(keys_dir / "title.keys", true); + LoadFromFile(keys_dir / "console.keys_autogenerated", false); + LoadFromFile(keys_dir / "console.keys", false); } static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_t length) { - if (base.size() < begin + length) { + if (base.size() < begin + length) return false; - } return std::all_of(base.begin() + begin, base.begin() + begin + length, [](u8 c) { return std::isxdigit(c); }); } @@ -850,9 +838,8 @@ void KeyManager::WriteKeyToFile(KeyCategory category, std::string_view keyname, const auto yuzu_keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir); std::string filename = "title.keys_autogenerated"; - if (category == KeyCategory::Standard) { - filename = dev_mode ? "dev.keys_autogenerated" : "prod.keys_autogenerated"; + filename = "prod.keys_autogenerated"; } else if (category == KeyCategory::Console) { filename = "console.keys_autogenerated"; } @@ -947,17 +934,10 @@ void KeyManager::SetKey(S256KeyType id, Key256 key, u64 field1, u64 field2) { } bool KeyManager::KeyFileExists(bool title) { - const auto yuzu_keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir); - - if (title) { - return Common::FS::Exists(yuzu_keys_dir / "title.keys"); - } - - if (Settings::values.use_dev_keys) { - return Common::FS::Exists(yuzu_keys_dir / "dev.keys"); - } - - return Common::FS::Exists(yuzu_keys_dir / "prod.keys"); + const auto keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir); + if (title) + return Common::FS::Exists(keys_dir / "title.keys"); + return Common::FS::Exists(keys_dir / "prod.keys"); } void KeyManager::DeriveSDSeedLazy() { |