daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-26 09:51:21 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1500 from DarkLordZach/key-derivation-6.0.0

Browse Source 
crypto: Various crypto fixes for quickstart guide
This commit is contained in:
bunnei 2018-10-15 17:48:13 -04:00 committed by GitHub
commit 7665411317
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/crypto/partition_data_manager.cpp
View File

@ -303,8 +303,8 @@ FileSys::VirtualFile FindFileInDirWithNames(const FileSys::VirtualDir& dir,
PartitionDataManager::PartitionDataManager(const FileSys::VirtualDir& sysdata_dir) PartitionDataManager::PartitionDataManager(const FileSys::VirtualDir& sysdata_dir)
: boot0(FindFileInDirWithNames(sysdata_dir, "BOOT0")), : boot0(FindFileInDirWithNames(sysdata_dir, "BOOT0")),
fuses(FindFileInDirWithNames(sysdata_dir, "fuse")), fuses(FindFileInDirWithNames(sysdata_dir, "fuses")),
kfuses(FindFileInDirWithNames(sysdata_dir, "kfuse")), kfuses(FindFileInDirWithNames(sysdata_dir, "kfuses")),
package2({ package2({
FindFileInDirWithNames(sysdata_dir, "BCPKG2-1-Normal-Main"), FindFileInDirWithNames(sysdata_dir, "BCPKG2-1-Normal-Main"),
FindFileInDirWithNames(sysdata_dir, "BCPKG2-2-Normal-Sub"), FindFileInDirWithNames(sysdata_dir, "BCPKG2-2-Normal-Sub"),

8
src/yuzu/main.cpp
View File

@ -1428,8 +1428,12 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
QMessageBox::warning( QMessageBox::warning(
this, tr("Warning Missing Derivation Components"), this, tr("Warning Missing Derivation Components"),
tr("The following are missing from your configuration that may hinder key " tr("The following are missing from your configuration that may hinder key "
"derivation. It will be attempted but may not complete.\n\n") + "derivation. It will be attempted but may not complete.<br><br>") +
errors); 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; QProgressDialog prog;