aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/crypto
diff options
context:
space:
mode:
authorValeri <[email protected]>2022-11-27 05:08:25 +0300
committerGitHub <[email protected]>2022-11-27 05:08:25 +0300
commit278c0e6e8d828db86773233587f352d12cfaba5a (patch)
treee0e66edc8794340e19a2ed48e0a491589c9265ef /src/core/crypto
parenteabe45346fa41a63a2c0231014ba02e1cf2e37ee (diff)
downloadyuzu-android-278c0e6e8d828db86773233587f352d12cfaba5a.tar.gz
yuzu-android-278c0e6e8d828db86773233587f352d12cfaba5a.zip
crypto: use user-provided keys whenever possible
Solves an issue where autogenerated title keys would take precedence over those provided by user.
Diffstat (limited to 'src/core/crypto')
-rw-r--r--src/core/crypto/key_manager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp
index 443323390..65a9fe802 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) {