From 03149d3e4a7f8038d9c88cbeb19dee25a39e0042 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 29 Jul 2018 19:00:09 -0400 Subject: Add missing includes and use const where applicable --- src/core/crypto/aes_util.h | 7 +++++-- src/core/crypto/ctr_encryption_layer.cpp | 7 +++---- src/core/crypto/ctr_encryption_layer.h | 1 + src/core/crypto/encryption_layer.h | 3 ++- src/core/crypto/key_manager.cpp | 13 ++++++++----- src/core/crypto/key_manager.h | 7 ++++--- src/core/file_sys/card_image.cpp | 5 +++-- src/core/file_sys/card_image.h | 3 +++ src/core/file_sys/content_archive.cpp | 4 ++-- src/core/file_sys/content_archive.h | 11 ++++++----- src/core/loader/xci.h | 3 +++ 11 files changed, 40 insertions(+), 24 deletions(-) (limited to 'src/core') diff --git a/src/core/crypto/aes_util.h b/src/core/crypto/aes_util.h index fa77d5560..5b0b02738 100644 --- a/src/core/crypto/aes_util.h +++ b/src/core/crypto/aes_util.h @@ -4,11 +4,16 @@ #pragma once +#include +#include +#include #include "common/assert.h" #include "core/file_sys/vfs.h" namespace Core::Crypto { +struct CipherContext; + enum class Mode { CTR = 11, ECB = 2, @@ -20,8 +25,6 @@ enum class Op { Decrypt, }; -struct CipherContext; - template class AESCipher { static_assert(std::is_same_v>, "Key must be std::array of u8."); diff --git a/src/core/crypto/ctr_encryption_layer.cpp b/src/core/crypto/ctr_encryption_layer.cpp index 5dbc257e5..106db02b3 100644 --- a/src/core/crypto/ctr_encryption_layer.cpp +++ b/src/core/crypto/ctr_encryption_layer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include +#include #include "common/assert.h" #include "core/crypto/ctr_encryption_layer.h" @@ -33,11 +33,10 @@ size_t CTREncryptionLayer::Read(u8* data, size_t length, size_t offset) const { size_t read = 0x10 - sector_offset; if (length + sector_offset < 0x10) { - memcpy(data, block.data() + sector_offset, std::min(length, read)); + std::memcpy(data, block.data() + sector_offset, std::min(length, read)); return read; } - - memcpy(data, block.data() + sector_offset, read); + std::memcpy(data, block.data() + sector_offset, read); return read + Read(data + read, length - read, offset + read); } diff --git a/src/core/crypto/ctr_encryption_layer.h b/src/core/crypto/ctr_encryption_layer.h index 697d7c6a5..11b8683c7 100644 --- a/src/core/crypto/ctr_encryption_layer.h +++ b/src/core/crypto/ctr_encryption_layer.h @@ -4,6 +4,7 @@ #pragma once +#include #include "core/crypto/aes_util.h" #include "core/crypto/encryption_layer.h" #include "core/crypto/key_manager.h" diff --git a/src/core/crypto/encryption_layer.h b/src/core/crypto/encryption_layer.h index 84f11bf5e..71bca1f23 100644 --- a/src/core/crypto/encryption_layer.h +++ b/src/core/crypto/encryption_layer.h @@ -10,7 +10,8 @@ namespace Core::Crypto { // Basically non-functional class that implements all of the methods that are irrelevant to an // EncryptionLayer. Reduces duplicate code. -struct EncryptionLayer : public FileSys::VfsFile { +class EncryptionLayer : public FileSys::VfsFile { +public: explicit EncryptionLayer(FileSys::VirtualFile base); size_t Read(u8* data, size_t length, size_t offset) const override = 0; diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index dea092b5e..33633de7e 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -2,9 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include +#include #include #include "common/assert.h" #include "common/common_paths.h" @@ -86,17 +88,18 @@ void KeyManager::LoadFromFile(std::string_view filename_, bool is_title_keys) { if (is_title_keys) { auto rights_id_raw = HexStringToArray<16>(out[0]); - u128 rights_id = *reinterpret_cast*>(&rights_id_raw); + u128 rights_id{}; + std::memcpy(rights_id.data(), rights_id_raw.data(), rights_id_raw.size()); Key128 key = HexStringToArray<16>(out[1]); SetKey(S128KeyType::Titlekey, key, rights_id[1], rights_id[0]); } else { std::transform(out[0].begin(), out[0].end(), out[0].begin(), ::tolower); if (s128_file_id.find(out[0]) != s128_file_id.end()) { - const auto index = s128_file_id[out[0]]; + const auto index = s128_file_id.at(out[0]); Key128 key = HexStringToArray<16>(out[1]); SetKey(index.type, key, index.field1, index.field2); } else if (s256_file_id.find(out[0]) != s256_file_id.end()) { - const auto index = s256_file_id[out[0]]; + const auto index = s256_file_id.at(out[0]); Key256 key = HexStringToArray<32>(out[1]); SetKey(index.type, key, index.field1, index.field2); } @@ -143,7 +146,7 @@ void KeyManager::SetKey(S256KeyType id, Key256 key, u64 field1, u64 field2) { s256_keys[{id, field1, field2}] = key; } -std::unordered_map> KeyManager::s128_file_id = { +const std::unordered_map> KeyManager::s128_file_id = { {"master_key_00", {S128KeyType::Master, 0, 0}}, {"master_key_01", {S128KeyType::Master, 1, 0}}, {"master_key_02", {S128KeyType::Master, 2, 0}}, @@ -187,7 +190,7 @@ std::unordered_map> KeyManager::s128_file_id {"key_area_key_system_04", {S128KeyType::KeyArea, 4, static_cast(KeyAreaKeyType::System)}}, }; -std::unordered_map> KeyManager::s256_file_id = { +const std::unordered_map> KeyManager::s256_file_id = { {"header_key", {S256KeyType::Header, 0, 0}}, {"sd_card_save_key", {S256KeyType::SDSave, 0, 0}}, {"sd_card_nca_key", {S256KeyType::SDNCA, 0, 0}}, diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index a52ea4cb9..28a560a3f 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include #include @@ -50,7 +51,7 @@ struct KeyIndex { std::string DebugInfo() const { u8 key_size = 16; - if (std::is_same_v) + if constexpr (std::is_same_v) key_size = 32; return fmt::format("key_size={:02X}, key={:02X}, field1={:016X}, field2={:016X}", key_size, static_cast(type), field1, field2); @@ -110,7 +111,7 @@ private: void AttemptLoadKeyFile(std::string_view dir1, std::string_view dir2, std::string_view filename, bool title); - static std::unordered_map> s128_file_id; - static std::unordered_map> s256_file_id; + const static std::unordered_map> s128_file_id; + const static std::unordered_map> s256_file_id; }; } // namespace Core::Crypto diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp index 3c1dbf46c..c69812455 100644 --- a/src/core/file_sys/card_image.cpp +++ b/src/core/file_sys/card_image.cpp @@ -93,8 +93,9 @@ VirtualDir XCI::GetLogoPartition() const { } std::shared_ptr XCI::GetNCAByType(NCAContentType type) const { - auto iter = std::find_if(ncas.begin(), ncas.end(), - [type](std::shared_ptr nca) { return nca->GetType() == type; }); + const auto iter = + std::find_if(ncas.begin(), ncas.end(), + [type](const std::shared_ptr& nca) { return nca->GetType() == type; }); return iter == ncas.end() ? nullptr : *iter; } diff --git a/src/core/file_sys/card_image.h b/src/core/file_sys/card_image.h index b765c8bc1..e089d737c 100644 --- a/src/core/file_sys/card_image.h +++ b/src/core/file_sys/card_image.h @@ -4,10 +4,13 @@ #pragma once +#include #include +#include "common/common_types.h" #include "common/swap.h" #include "core/file_sys/content_archive.h" #include "core/file_sys/vfs.h" +#include "core/loader/loader.h" namespace FileSys { diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 952dc7068..9eceaa4c4 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -76,7 +76,7 @@ bool IsValidNCA(const NCAHeader& header) { return header.magic == Common::MakeMagic('N', 'C', 'A', '3'); } -Core::Crypto::Key128 NCA::GetKeyAreaKey(NCASectionCryptoType type) { +Core::Crypto::Key128 NCA::GetKeyAreaKey(NCASectionCryptoType type) const { u8 master_key_id = header.crypto_type; if (header.crypto_type_2 > master_key_id) master_key_id = header.crypto_type_2; @@ -105,7 +105,7 @@ Core::Crypto::Key128 NCA::GetKeyAreaKey(NCASectionCryptoType type) { return out; } -VirtualFile NCA::Decrypt(NCASectionHeader header, VirtualFile in, u64 starting_offset) { +VirtualFile NCA::Decrypt(NCASectionHeader header, VirtualFile in, u64 starting_offset) const { if (!encrypted) return in; diff --git a/src/core/file_sys/content_archive.h b/src/core/file_sys/content_archive.h index 153142b06..e68ab0235 100644 --- a/src/core/file_sys/content_archive.h +++ b/src/core/file_sys/content_archive.h @@ -17,6 +17,9 @@ #include "core/loader/loader.h" namespace FileSys { + +union NCASectionHeader; + enum class NCAContentType : u8 { Program = 0, Meta = 1, @@ -61,8 +64,6 @@ struct NCAHeader { }; static_assert(sizeof(NCAHeader) == 0x400, "NCAHeader has incorrect size."); -union NCASectionHeader; - inline bool IsDirectoryExeFS(const std::shared_ptr& pfs) { // According to switchbrew, an exefs must only contain these two files: return pfs->GetFile("main") != nullptr && pfs->GetFile("main.npdm") != nullptr; @@ -94,6 +95,9 @@ protected: bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override; private: + Core::Crypto::Key128 GetKeyAreaKey(NCASectionCryptoType type) const; + VirtualFile Decrypt(NCASectionHeader header, VirtualFile in, u64 starting_offset) const; + std::vector dirs; std::vector files; @@ -108,9 +112,6 @@ private: bool encrypted; Core::Crypto::KeyManager keys; - Core::Crypto::Key128 GetKeyAreaKey(NCASectionCryptoType type); - - VirtualFile Decrypt(NCASectionHeader header, VirtualFile in, u64 starting_offset); }; } // namespace FileSys diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index 2a09caa5f..0dbcfbdf8 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h @@ -4,7 +4,10 @@ #pragma once +#include +#include "common/common_types.h" #include "core/file_sys/card_image.h" +#include "core/loader/loader.h" #include "core/loader/nca.h" namespace Loader { -- cgit v1.2.3