diff options
| author | David <25727384+ogniK5377@users.noreply.github.com> | 2020-07-01 14:16:26 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 14:16:26 +1000 |
| commit | 3bb63bc0b364ed10d478102d3174f55486438716 (patch) | |
| tree | c8ecf8b20b877bd08701e0213e446e4bb9a8660c /src/core/file_sys/content_archive.cpp | |
| parent | c6b0353c4dac96a592b67f6360909d2ac0836ea6 (diff) | |
| parent | 9f82a9a2444a232e746992fa89084b928255cb63 (diff) | |
Merge pull request #3967 from FearlessTobi/keys-singleton
crypto: Make KeyManager a singleton class
Diffstat (limited to 'src/core/file_sys/content_archive.cpp')
| -rw-r--r-- | src/core/file_sys/content_archive.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index b8bbdd1ef..473245d5a 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -118,9 +118,8 @@ static bool IsValidNCA(const NCAHeader& header) { return header.magic == Common::MakeMagic('N', 'C', 'A', '3'); } -NCA::NCA(VirtualFile file_, VirtualFile bktr_base_romfs_, u64 bktr_base_ivfc_offset, - Core::Crypto::KeyManager keys_) - : file(std::move(file_)), bktr_base_romfs(std::move(bktr_base_romfs_)), keys(std::move(keys_)) { +NCA::NCA(VirtualFile file_, VirtualFile bktr_base_romfs_, u64 bktr_base_ivfc_offset) + : file(std::move(file_)), bktr_base_romfs(std::move(bktr_base_romfs_)) { if (file == nullptr) { status = Loader::ResultStatus::ErrorNullFile; return; |