mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-27 09:12:46 +01:00
Use ErrorEncrypted where applicable and fix no keys crash
This commit is contained in:
parent
03149d3e4a
commit
a9c921a41d
4 changed files with 36 additions and 16 deletions
|
@ -45,6 +45,7 @@ XCI::XCI(VirtualFile file_) : file(std::move(file_)), partitions(0x4) {
|
||||||
status = result;
|
status = result;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = AddNCAFromPartition(XCIPartition::Update);
|
result = AddNCAFromPartition(XCIPartition::Update);
|
||||||
if (result != Loader::ResultStatus::Success) {
|
if (result != Loader::ResultStatus::Success) {
|
||||||
status = result;
|
status = result;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include <boost/optional.hpp>
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "core/crypto/aes_util.h"
|
#include "core/crypto/aes_util.h"
|
||||||
#include "core/crypto/ctr_encryption_layer.h"
|
#include "core/crypto/ctr_encryption_layer.h"
|
||||||
|
@ -76,13 +76,16 @@ bool IsValidNCA(const NCAHeader& header) {
|
||||||
return header.magic == Common::MakeMagic('N', 'C', 'A', '3');
|
return header.magic == Common::MakeMagic('N', 'C', 'A', '3');
|
||||||
}
|
}
|
||||||
|
|
||||||
Core::Crypto::Key128 NCA::GetKeyAreaKey(NCASectionCryptoType type) const {
|
boost::optional<Core::Crypto::Key128> NCA::GetKeyAreaKey(NCASectionCryptoType type) const {
|
||||||
u8 master_key_id = header.crypto_type;
|
u8 master_key_id = header.crypto_type;
|
||||||
if (header.crypto_type_2 > master_key_id)
|
if (header.crypto_type_2 > master_key_id)
|
||||||
master_key_id = header.crypto_type_2;
|
master_key_id = header.crypto_type_2;
|
||||||
if (master_key_id > 0)
|
if (master_key_id > 0)
|
||||||
--master_key_id;
|
--master_key_id;
|
||||||
|
|
||||||
|
if (!keys.HasKey(Core::Crypto::S128KeyType::KeyArea, master_key_id, header.key_index))
|
||||||
|
return boost::none;
|
||||||
|
|
||||||
std::vector<u8> key_area(header.key_area.begin(), header.key_area.end());
|
std::vector<u8> key_area(header.key_area.begin(), header.key_area.end());
|
||||||
Core::Crypto::AESCipher<Core::Crypto::Key128> cipher(
|
Core::Crypto::AESCipher<Core::Crypto::Key128> cipher(
|
||||||
keys.GetKey(Core::Crypto::S128KeyType::KeyArea, master_key_id, header.key_index),
|
keys.GetKey(Core::Crypto::S128KeyType::KeyArea, master_key_id, header.key_index),
|
||||||
|
@ -116,13 +119,16 @@ VirtualFile NCA::Decrypt(NCASectionHeader header, VirtualFile in, u64 starting_o
|
||||||
case NCASectionCryptoType::CTR:
|
case NCASectionCryptoType::CTR:
|
||||||
LOG_DEBUG(Crypto, "called with mode=CTR, starting_offset={:016X}", starting_offset);
|
LOG_DEBUG(Crypto, "called with mode=CTR, starting_offset={:016X}", starting_offset);
|
||||||
{
|
{
|
||||||
|
const auto key = GetKeyAreaKey(NCASectionCryptoType::CTR);
|
||||||
|
if (key == boost::none)
|
||||||
|
return nullptr;
|
||||||
auto out = std::make_shared<Core::Crypto::CTREncryptionLayer>(
|
auto out = std::make_shared<Core::Crypto::CTREncryptionLayer>(
|
||||||
std::move(in), GetKeyAreaKey(NCASectionCryptoType::CTR), starting_offset);
|
std::move(in), key.value(), starting_offset);
|
||||||
std::vector<u8> iv(16);
|
std::vector<u8> iv(16);
|
||||||
for (u8 i = 0; i < 8; ++i)
|
for (u8 i = 0; i < 8; ++i)
|
||||||
iv[i] = header.raw.section_ctr[0x8 - i - 1];
|
iv[i] = header.raw.section_ctr[0x8 - i - 1];
|
||||||
out->SetIV(iv);
|
out->SetIV(iv);
|
||||||
return out;
|
return std::static_pointer_cast<VfsFile>(out);
|
||||||
}
|
}
|
||||||
case NCASectionCryptoType::XTS:
|
case NCASectionCryptoType::XTS:
|
||||||
// TODO(DarkLordZach): Implement XTSEncryptionLayer and title key encryption.
|
// TODO(DarkLordZach): Implement XTSEncryptionLayer and title key encryption.
|
||||||
|
@ -149,7 +155,10 @@ NCA::NCA(VirtualFile file_) : file(std::move(file_)) {
|
||||||
header = dec_header;
|
header = dec_header;
|
||||||
encrypted = true;
|
encrypted = true;
|
||||||
} else {
|
} else {
|
||||||
status = Loader::ResultStatus::ErrorInvalidFormat;
|
if (!keys.HasKey(Core::Crypto::S256KeyType::Header))
|
||||||
|
status = Loader::ResultStatus::ErrorEncrypted;
|
||||||
|
else
|
||||||
|
status = Loader::ResultStatus::ErrorInvalidFormat;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -179,23 +188,29 @@ NCA::NCA(VirtualFile file_) : file(std::move(file_)) {
|
||||||
header.section_tables[i].media_offset * MEDIA_OFFSET_MULTIPLIER +
|
header.section_tables[i].media_offset * MEDIA_OFFSET_MULTIPLIER +
|
||||||
section.romfs.ivfc.levels[IVFC_MAX_LEVEL - 1].offset;
|
section.romfs.ivfc.levels[IVFC_MAX_LEVEL - 1].offset;
|
||||||
const size_t romfs_size = section.romfs.ivfc.levels[IVFC_MAX_LEVEL - 1].size;
|
const size_t romfs_size = section.romfs.ivfc.levels[IVFC_MAX_LEVEL - 1].size;
|
||||||
files.emplace_back(
|
const auto dec =
|
||||||
Decrypt(section, std::make_shared<OffsetVfsFile>(file, romfs_size, romfs_offset),
|
Decrypt(section, std::make_shared<OffsetVfsFile>(file, romfs_size, romfs_offset),
|
||||||
romfs_offset));
|
romfs_offset);
|
||||||
romfs = files.back();
|
if (dec != nullptr) {
|
||||||
|
files.emplace_back();
|
||||||
|
romfs = files.back();
|
||||||
|
}
|
||||||
} else if (section.raw.header.filesystem_type == NCASectionFilesystemType::PFS0) {
|
} else if (section.raw.header.filesystem_type == NCASectionFilesystemType::PFS0) {
|
||||||
u64 offset = (static_cast<u64>(header.section_tables[i].media_offset) *
|
u64 offset = (static_cast<u64>(header.section_tables[i].media_offset) *
|
||||||
MEDIA_OFFSET_MULTIPLIER) +
|
MEDIA_OFFSET_MULTIPLIER) +
|
||||||
section.pfs0.pfs0_header_offset;
|
section.pfs0.pfs0_header_offset;
|
||||||
u64 size = MEDIA_OFFSET_MULTIPLIER * (header.section_tables[i].media_end_offset -
|
u64 size = MEDIA_OFFSET_MULTIPLIER * (header.section_tables[i].media_end_offset -
|
||||||
header.section_tables[i].media_offset);
|
header.section_tables[i].media_offset);
|
||||||
auto npfs = std::make_shared<PartitionFilesystem>(
|
const auto dec =
|
||||||
Decrypt(section, std::make_shared<OffsetVfsFile>(file, size, offset), offset));
|
Decrypt(section, std::make_shared<OffsetVfsFile>(file, size, offset), offset);
|
||||||
|
if (dec != nullptr) {
|
||||||
|
auto npfs = std::make_shared<PartitionFilesystem>(dec);
|
||||||
|
|
||||||
if (npfs->GetStatus() == Loader::ResultStatus::Success) {
|
if (npfs->GetStatus() == Loader::ResultStatus::Success) {
|
||||||
dirs.emplace_back(npfs);
|
dirs.emplace_back(npfs);
|
||||||
if (IsDirectoryExeFS(dirs.back()))
|
if (IsDirectoryExeFS(dirs.back()))
|
||||||
exefs = dirs.back();
|
exefs = dirs.back();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <boost/optional.hpp>
|
||||||
#include "common/common_funcs.h"
|
#include "common/common_funcs.h"
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/swap.h"
|
#include "common/swap.h"
|
||||||
|
@ -95,7 +95,7 @@ protected:
|
||||||
bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;
|
bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Core::Crypto::Key128 GetKeyAreaKey(NCASectionCryptoType type) const;
|
boost::optional<Core::Crypto::Key128> GetKeyAreaKey(NCASectionCryptoType type) const;
|
||||||
VirtualFile Decrypt(NCASectionHeader header, VirtualFile in, u64 starting_offset) const;
|
VirtualFile Decrypt(NCASectionHeader header, VirtualFile in, u64 starting_offset) const;
|
||||||
|
|
||||||
std::vector<VirtualDir> dirs;
|
std::vector<VirtualDir> dirs;
|
||||||
|
|
|
@ -48,6 +48,10 @@ ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) {
|
||||||
return ResultStatus::ErrorAlreadyLoaded;
|
return ResultStatus::ErrorAlreadyLoaded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) {
|
||||||
|
return ResultStatus::ErrorEncrypted;
|
||||||
|
}
|
||||||
|
|
||||||
auto result = nca_loader->Load(process);
|
auto result = nca_loader->Load(process);
|
||||||
if (result != ResultStatus::Success)
|
if (result != ResultStatus::Success)
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in a new issue