Browse Source
Merge pull request #9324 from v1993/master
crypto: use user-provided keys whenever possible
pull/15/merge
Morph
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
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) { |
|
|
|
|
