diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-09-15 00:27:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-15 00:27:33 +0200 |
commit | 0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971 (patch) | |
tree | 3ef2537360711465dc0b08a79aa22a4180aa4f49 /src/core/crypto/key_manager.cpp | |
parent | Merge pull request #4651 from lioncash/kernel-global (diff) | |
parent | crypto/key_manager: Remove dependency on the global system accessor (diff) | |
download | yuzu-0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971.tar yuzu-0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971.tar.gz yuzu-0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971.tar.bz2 yuzu-0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971.tar.lz yuzu-0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971.tar.xz yuzu-0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971.tar.zst yuzu-0bac7b6a95f553fd33f3ec74e0c7f00c8bd17971.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/crypto/key_manager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index dc591c730..65d246050 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -23,7 +23,6 @@ #include "common/hex_util.h" #include "common/logging/log.h" #include "common/string_util.h" -#include "core/core.h" #include "core/crypto/aes_util.h" #include "core/crypto/key_manager.h" #include "core/crypto/partition_data_manager.h" @@ -1022,10 +1021,10 @@ void KeyManager::DeriveBase() { } } -void KeyManager::DeriveETicket(PartitionDataManager& data) { +void KeyManager::DeriveETicket(PartitionDataManager& data, + const FileSys::ContentProvider& provider) { // ETicket keys - const auto es = Core::System::GetInstance().GetContentProvider().GetEntry( - 0x0100000000000033, FileSys::ContentRecordType::Program); + const auto es = provider.GetEntry(0x0100000000000033, FileSys::ContentRecordType::Program); if (es == nullptr) { return; |