crypto: use user-provided keys whenever possible
Solves an issue where autogenerated title keys would take precedence over those provided by user.
This commit is contained in:
parent
eabe45346f
commit
278c0e6e8d
|
@ -578,18 +578,18 @@ KeyManager::KeyManager() {
|
||||||
|
|
||||||
if (Settings::values.use_dev_keys) {
|
if (Settings::values.use_dev_keys) {
|
||||||
dev_mode = true;
|
dev_mode = true;
|
||||||
LoadFromFile(yuzu_keys_dir / "dev.keys", false);
|
|
||||||
LoadFromFile(yuzu_keys_dir / "dev.keys_autogenerated", false);
|
LoadFromFile(yuzu_keys_dir / "dev.keys_autogenerated", false);
|
||||||
|
LoadFromFile(yuzu_keys_dir / "dev.keys", false);
|
||||||
} else {
|
} else {
|
||||||
dev_mode = false;
|
dev_mode = false;
|
||||||
LoadFromFile(yuzu_keys_dir / "prod.keys", false);
|
|
||||||
LoadFromFile(yuzu_keys_dir / "prod.keys_autogenerated", 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 / "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_autogenerated", false);
|
||||||
|
LoadFromFile(yuzu_keys_dir / "console.keys", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_t length) {
|
static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_t length) {
|
||||||
|
|
Reference in New Issue