diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-11-26 21:20:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-26 21:20:05 -0500 |
| commit | ef6144bf48dc0196bb2ef6cf0e0710ca6b58b1e7 (patch) | |
| tree | e0e66edc8794340e19a2ed48e0a491589c9265ef /src | |
| parent | eabe45346fa41a63a2c0231014ba02e1cf2e37ee (diff) | |
| parent | 278c0e6e8d828db86773233587f352d12cfaba5a (diff) | |
Merge pull request #9324 from v1993/master
crypto: use user-provided keys whenever possible
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/crypto/key_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 443323390c..65a9fe8027 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -578,18 +578,18 @@ KeyManager::KeyManager() { if (Settings::values.use_dev_keys) { dev_mode = true; - LoadFromFile(yuzu_keys_dir / "dev.keys", false); 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", false); LoadFromFile(yuzu_keys_dir / "prod.keys_autogenerated", false); + LoadFromFile(yuzu_keys_dir / "prod.keys", false); } - LoadFromFile(yuzu_keys_dir / "title.keys", true); LoadFromFile(yuzu_keys_dir / "title.keys_autogenerated", true); - LoadFromFile(yuzu_keys_dir / "console.keys", false); + LoadFromFile(yuzu_keys_dir / "title.keys", true); LoadFromFile(yuzu_keys_dir / "console.keys_autogenerated", false); + LoadFromFile(yuzu_keys_dir / "console.keys", false); } static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_t length) { |