Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crypto/key_manager: Remove dependency on the global system accessor

Browse source 
We can supply the content provider as an argument instead of hardcoding
a global accessor in the implementation.
This commit is contained in:
Lioncash 2020-09-14 16:47:25 -04:00
parent 1a9774f824
commit e0dd440b1f
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/crypto/key_manager.cpp
View file

@ -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;