diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-11-02 01:22:29 +0100 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-02 01:22:29 +0100 |
commit | e20db909eeb7dc6670924032e7cbb4add4652908 (patch) | |
tree | 01c27f3e0dcd4ed34b49a3b410a28004c4de398b | |
parent | Merge pull request #1624 from lioncash/boost (diff) | |
download | yuzu-e20db909eeb7dc6670924032e7cbb4add4652908.tar yuzu-e20db909eeb7dc6670924032e7cbb4add4652908.tar.gz yuzu-e20db909eeb7dc6670924032e7cbb4add4652908.tar.bz2 yuzu-e20db909eeb7dc6670924032e7cbb4add4652908.tar.lz yuzu-e20db909eeb7dc6670924032e7cbb4add4652908.tar.xz yuzu-e20db909eeb7dc6670924032e7cbb4add4652908.tar.zst yuzu-e20db909eeb7dc6670924032e7cbb4add4652908.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/content_archive.cpp | 5 | ||||
-rw-r--r-- | src/core/file_sys/content_archive.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index b46fe893c..19b6f8600 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -101,8 +101,9 @@ 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) - : file(std::move(file_)), bktr_base_romfs(std::move(bktr_base_romfs_)) { +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_)) { if (file == nullptr) { status = Loader::ResultStatus::ErrorNullFile; return; diff --git a/src/core/file_sys/content_archive.h b/src/core/file_sys/content_archive.h index 4bba55607..99294cbb4 100644 --- a/src/core/file_sys/content_archive.h +++ b/src/core/file_sys/content_archive.h @@ -79,7 +79,8 @@ inline bool IsDirectoryExeFS(const std::shared_ptr<VfsDirectory>& pfs) { class NCA : public ReadOnlyVfsDirectory { public: explicit NCA(VirtualFile file, VirtualFile bktr_base_romfs = nullptr, - u64 bktr_base_ivfc_offset = 0); + u64 bktr_base_ivfc_offset = 0, + Core::Crypto::KeyManager keys = Core::Crypto::KeyManager()); ~NCA() override; Loader::ResultStatus GetStatus() const; |