diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-05-02 18:17:24 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-02 18:17:24 -0400 | 
| commit | 494cc992eb2d29a25f4df61bfb92f713647f4d9a (patch) | |
| tree | ddbfa0d25e5bf4658911daed4b9f508a72bbc2db | |
| parent | f603dc9763bcedee57619ec192b90f745416c210 (diff) | |
| parent | 7ec66db22ce04e647f863633a9999ab4c11d3893 (diff) | |
Merge pull request #10130 from liamwhite/keys
qt: warn on inoperable keys
| -rw-r--r-- | src/yuzu/main.cpp | 33 | ||||
| -rw-r--r-- | src/yuzu/main.h | 1 | 
2 files changed, 34 insertions, 0 deletions
| diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b79409a68..ba9eece1d 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -27,6 +27,7 @@  #include "configuration/configure_input.h"  #include "configuration/configure_per_game.h"  #include "configuration/configure_tas.h" +#include "core/file_sys/romfs_factory.h"  #include "core/file_sys/vfs.h"  #include "core/file_sys/vfs_real.h"  #include "core/frontend/applets/cabinet.h" @@ -4171,6 +4172,8 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {      }      Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance(); +    bool all_keys_present{true}; +      if (keys.BaseDeriveNecessary()) {          Core::Crypto::PartitionDataManager pdm{vfs->OpenDirectory("", FileSys::Mode::Read)}; @@ -4195,6 +4198,7 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {              errors += tr(" - Missing PRODINFO");          }          if (!errors.isEmpty()) { +            all_keys_present = false;              QMessageBox::warning(                  this, tr("Derivation Components Missing"),                  tr("Encryption keys are missing. " @@ -4222,11 +4226,40 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {      system->GetFileSystemController().CreateFactories(*vfs); +    if (all_keys_present && !this->CheckSystemArchiveDecryption()) { +        LOG_WARNING(Frontend, "Mii model decryption failed"); +        QMessageBox::warning( +            this, tr("System Archive Decryption Failed"), +            tr("Encryption keys failed to decrypt firmware. " +               "<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu " +               "quickstart guide</a> to get all your keys, firmware and " +               "games.")); +    } +      if (behavior == ReinitializeKeyBehavior::Warning) {          game_list->PopulateAsync(UISettings::values.game_dirs);      }  } +bool GMainWindow::CheckSystemArchiveDecryption() { +    constexpr u64 MiiModelId = 0x0100000000000802; + +    auto bis_system = system->GetFileSystemController().GetSystemNANDContents(); +    if (!bis_system) { +        // Not having system BIS files is not an error. +        return true; +    } + +    auto mii_nca = bis_system->GetEntry(MiiModelId, FileSys::ContentRecordType::Data); +    if (!mii_nca) { +        // Not having the Mii model is not an error. +        return true; +    } + +    // Return whether we are able to decrypt the RomFS of the Mii model. +    return mii_nca->GetRomFS().get() != nullptr; +} +  std::optional<u64> GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProvider& installed,                                                        u64 program_id) {      const auto dlc_entries = diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 8b5c1d747..3bbc31ada 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -392,6 +392,7 @@ private:      void LoadTranslation();      void OpenPerGameConfiguration(u64 title_id, const std::string& file_name);      bool CheckDarkMode(); +    bool CheckSystemArchiveDecryption();      QString GetTasStateDescription() const;      bool CreateShortcut(const std::string& shortcut_path, const std::string& title, | 
