Browse Source
Merge pull request #1500 from DarkLordZach/key-derivation-6.0.0
crypto: Various crypto fixes for quickstart guide
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
4 deletions
-
src/core/crypto/partition_data_manager.cpp
-
src/yuzu/main.cpp
|
|
|
@ -303,8 +303,8 @@ FileSys::VirtualFile FindFileInDirWithNames(const FileSys::VirtualDir& dir, |
|
|
|
|
|
|
|
PartitionDataManager::PartitionDataManager(const FileSys::VirtualDir& sysdata_dir) |
|
|
|
: boot0(FindFileInDirWithNames(sysdata_dir, "BOOT0")), |
|
|
|
fuses(FindFileInDirWithNames(sysdata_dir, "fuse")), |
|
|
|
kfuses(FindFileInDirWithNames(sysdata_dir, "kfuse")), |
|
|
|
fuses(FindFileInDirWithNames(sysdata_dir, "fuses")), |
|
|
|
kfuses(FindFileInDirWithNames(sysdata_dir, "kfuses")), |
|
|
|
package2({ |
|
|
|
FindFileInDirWithNames(sysdata_dir, "BCPKG2-1-Normal-Main"), |
|
|
|
FindFileInDirWithNames(sysdata_dir, "BCPKG2-2-Normal-Sub"), |
|
|
|
|
|
|
|
@ -1428,8 +1428,12 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) { |
|
|
|
QMessageBox::warning( |
|
|
|
this, tr("Warning Missing Derivation Components"), |
|
|
|
tr("The following are missing from your configuration that may hinder key " |
|
|
|
"derivation. It will be attempted but may not complete.\n\n") + |
|
|
|
errors); |
|
|
|
"derivation. It will be attempted but may not complete.<br><br>") + |
|
|
|
errors + |
|
|
|
tr("<br><br>You can get all of these and dump all of your games easily by " |
|
|
|
"following <a href='https://yuzu-emu.org/help/quickstart/quickstart/'>the " |
|
|
|
"quickstart guide</a>. Alternatively, you can use another method of dumping " |
|
|
|
"to obtain all of your keys.")); |
|
|
|
} |
|
|
|
|
|
|
|
QProgressDialog prog; |
|
|
|
|