summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Morph2022-11-26 21:20:05 -0500
committerGravatar GitHub2022-11-26 21:20:05 -0500
commitef6144bf48dc0196bb2ef6cf0e0710ca6b58b1e7 (patch)
treee0e66edc8794340e19a2ed48e0a491589c9265ef
parentMerge pull request #9318 from goldenx86/glsl-ftw (diff)
parentcrypto: use user-provided keys whenever possible (diff)
downloadyuzu-ef6144bf48dc0196bb2ef6cf0e0710ca6b58b1e7.tar.gz
yuzu-ef6144bf48dc0196bb2ef6cf0e0710ca6b58b1e7.tar.xz
yuzu-ef6144bf48dc0196bb2ef6cf0e0710ca6b58b1e7.zip
Merge pull request #9324 from v1993/master
crypto: use user-provided keys whenever possible
Diffstat (limited to '')
-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() {
578 578
579 if (Settings::values.use_dev_keys) { 579 if (Settings::values.use_dev_keys) {
580 dev_mode = true; 580 dev_mode = true;
581 LoadFromFile(yuzu_keys_dir / "dev.keys", false);
582 LoadFromFile(yuzu_keys_dir / "dev.keys_autogenerated", false); 581 LoadFromFile(yuzu_keys_dir / "dev.keys_autogenerated", false);
582 LoadFromFile(yuzu_keys_dir / "dev.keys", false);
583 } else { 583 } else {
584 dev_mode = false; 584 dev_mode = false;
585 LoadFromFile(yuzu_keys_dir / "prod.keys", false);
586 LoadFromFile(yuzu_keys_dir / "prod.keys_autogenerated", false); 585 LoadFromFile(yuzu_keys_dir / "prod.keys_autogenerated", false);
586 LoadFromFile(yuzu_keys_dir / "prod.keys", false);
587 } 587 }
588 588
589 LoadFromFile(yuzu_keys_dir / "title.keys", true);
590 LoadFromFile(yuzu_keys_dir / "title.keys_autogenerated", true); 589 LoadFromFile(yuzu_keys_dir / "title.keys_autogenerated", true);
591 LoadFromFile(yuzu_keys_dir / "console.keys", false); 590 LoadFromFile(yuzu_keys_dir / "title.keys", true);
592 LoadFromFile(yuzu_keys_dir / "console.keys_autogenerated", false); 591 LoadFromFile(yuzu_keys_dir / "console.keys_autogenerated", false);
592 LoadFromFile(yuzu_keys_dir / "console.keys", false);
593} 593}
594 594
595static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_t length) { 595static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_t length) {