diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-07-30 22:04:51 -0400 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-01 00:16:54 -0400 |
| commit | 0497bb5528f62f9e3db887988f0f93b4a1653a42 (patch) | |
| tree | c4f868272fb46e075e2e2c3f50504965dcf68796 /src/core | |
| parent | 187d8e215fb157edaa9f3976bebba9a9a7ed103d (diff) | |
Fix merge conflicts with opus and update docs
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/loader/xci.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 528d96a58..22fad97a3 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -348,7 +348,7 @@ add_library(core STATIC create_target_directory_groups(core) target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) -target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static opus unicorn) +target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static mbedtls opus unicorn) if (ARCHITECTURE_x86_64) target_sources(core PRIVATE diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index d757862f0..eb4dee2c2 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -49,6 +49,8 @@ ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) { } if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) { + if (!Core::Crypto::KeyManager::KeyFileExists(false)) + return ResultStatus::ErrorMissingKeys; return ResultStatus::ErrorDecrypting; } |