diff options
author | Zach Hilman <zachhilman@gmail.com> | 2019-07-06 00:50:50 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2019-09-22 01:21:58 +0200 |
commit | ae9604faba4fe1b43879efb24665e717397c094d (patch) | |
tree | b7e6150e32b9331e575723d05b57f10e8b7a20bf /src/core/hle/service/ns | |
parent | externals: Move OSS font data to file_sys in core (diff) | |
download | yuzu-ae9604faba4fe1b43879efb24665e717397c094d.tar yuzu-ae9604faba4fe1b43879efb24665e717397c094d.tar.gz yuzu-ae9604faba4fe1b43879efb24665e717397c094d.tar.bz2 yuzu-ae9604faba4fe1b43879efb24665e717397c094d.tar.lz yuzu-ae9604faba4fe1b43879efb24665e717397c094d.tar.xz yuzu-ae9604faba4fe1b43879efb24665e717397c094d.tar.zst yuzu-ae9604faba4fe1b43879efb24665e717397c094d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 26 | ||||
-rw-r--r-- | src/core/hle/service/ns/pl_u.h | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 2a522136d..6d6fdb4ed 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -6,13 +6,6 @@ #include <cstring> #include <vector> -#include <FontChineseSimplified.h> -#include <FontChineseTraditional.h> -#include <FontExtendedChineseSimplified.h> -#include <FontKorean.h> -#include <FontNintendoExtended.h> -#include <FontStandard.h> - #include "common/assert.h" #include "common/common_paths.h" #include "common/common_types.h" @@ -96,13 +89,18 @@ static void DecryptSharedFont(const std::vector<u32>& input, Kernel::PhysicalMem static void EncryptSharedFont(const std::vector<u8>& input, Kernel::PhysicalMemory& output, std::size_t& offset) { - ASSERT_MSG(offset + input.size() + 8 < SHARED_FONT_MEM_SIZE, "Shared fonts exceeds 17mb!"); - const u32 KEY = EXPECTED_MAGIC ^ EXPECTED_RESULT; - std::memcpy(output.data() + offset, &EXPECTED_RESULT, sizeof(u32)); // Magic header - const u32 ENC_SIZE = static_cast<u32>(input.size()) ^ KEY; - std::memcpy(output.data() + offset + sizeof(u32), &ENC_SIZE, sizeof(u32)); - std::memcpy(output.data() + offset + (sizeof(u32) * 2), input.data(), input.size()); - offset += input.size() + (sizeof(u32) * 2); + ASSERT_MSG(offset + (input.size() * sizeof(u32)) < SHARED_FONT_MEM_SIZE, + "Shared fonts exceeds 17mb!"); + + const auto key = Common::swap32(EXPECTED_RESULT ^ EXPECTED_MAGIC); + std::vector<u32> transformed_font(input.size() + 2); + transformed_font[0] = Common::swap32(EXPECTED_MAGIC); + transformed_font[1] = Common::swap32(input.size() * sizeof(u32)) ^ key; + std::transform(input.begin(), input.end(), transformed_font.begin() + 2, + [key](u32 in) { return in ^ key; }); + std::memcpy(output.data() + offset, transformed_font.data(), + transformed_font.size() * sizeof(u32)); + offset += transformed_font.size() * sizeof(u32); } // Helper function to make BuildSharedFontsRawRegions a bit nicer diff --git a/src/core/hle/service/ns/pl_u.h b/src/core/hle/service/ns/pl_u.h index 253f26a2a..d62459667 100644 --- a/src/core/hle/service/ns/pl_u.h +++ b/src/core/hle/service/ns/pl_u.h @@ -9,6 +9,8 @@ namespace Service::NS { +void EncryptSharedFont(const std::vector<u32>& input, std::vector<u8>& output, std::size_t& offset); + class PL_U final : public ServiceFramework<PL_U> { public: PL_U(); |