From 1911f853918669f3258259b51ebc3dac19ed61ef Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 23 Sep 2019 09:52:49 -0400 Subject: [PATCH] pl_u: Fix mismatched rebase size error in font encryption --- .../file_sys/system_archive/shared_font.cpp | 14 ++++++-------- src/core/hle/service/ns/pl_u.cpp | 18 ++++++++---------- src/core/hle/service/ns/pl_u.h | 4 +++- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/core/file_sys/system_archive/shared_font.cpp b/src/core/file_sys/system_archive/shared_font.cpp index 5bb5968245..2c05eb42e2 100644 --- a/src/core/file_sys/system_archive/shared_font.cpp +++ b/src/core/file_sys/system_archive/shared_font.cpp @@ -18,16 +18,14 @@ namespace { template VirtualFile PackBFTTF(const std::array& data, const std::string& name) { - std::vector vec(Size); - std::memcpy(vec.data(), data.data(), vec.size()); + std::vector vec(Size / sizeof(u32)); + std::memcpy(vec.data(), data.data(), vec.size() * sizeof(u32)); - Kernel::PhysicalMemory bfttf(Size + sizeof(u64)); + std::vector bfttf(Size + sizeof(u64)); - Service::NS::EncryptSharedFont(vec, bfttf); - - std::vector bfttf_vec(Size + sizeof(u64)); - std::memcpy(bfttf_vec.data(), bfttf.data(), bfttf_vec.size()); - return std::make_shared(std::move(bfttf_vec), name); + u64 offset = 0; + Service::NS::EncryptSharedFont(vec, bfttf, offset); + return std::make_shared(std::move(bfttf), name); } } // Anonymous namespace diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index b9c0f4b434..23477315f8 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -6,13 +6,6 @@ #include #include -#include -#include -#include -#include -#include -#include - #include "common/assert.h" #include "common/common_paths.h" #include "common/common_types.h" @@ -26,6 +19,7 @@ #include "core/file_sys/romfs.h" #include "core/file_sys/system_archive/system_archive.h" #include "core/hle/ipc_helpers.h" +#include "core/hle/kernel/physical_memory.h" #include "core/hle/kernel/shared_memory.h" #include "core/hle/service/filesystem/filesystem.h" #include "core/hle/service/ns/pl_u.h" @@ -95,8 +89,10 @@ static void DecryptSharedFont(const std::vector& input, Kernel::PhysicalMem offset += transformed_font.size() * sizeof(u32); } -void EncryptSharedFont(const std::vector& input, Kernel::PhysicalMemory& output) { - ASSERT_MSG(input.size() * sizeof(u32) < SHARED_FONT_MEM_SIZE, "Shared fonts exceeds 17mb!"); +void EncryptSharedFont(const std::vector& input, std::vector& output, + std::size_t& offset) { + 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 transformed_font(input.size() + 2); @@ -104,7 +100,9 @@ void EncryptSharedFont(const std::vector& input, Kernel::PhysicalMemory& out 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(), transformed_font.data(), transformed_font.size() * sizeof(u32)); + 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 a8aa358a2d..27161bd7a0 100644 --- a/src/core/hle/service/ns/pl_u.h +++ b/src/core/hle/service/ns/pl_u.h @@ -5,7 +5,7 @@ #pragma once #include -#include "core/hle/kernel/physical_memory.h" +#include #include "core/hle/service/service.h" namespace Service { @@ -16,6 +16,8 @@ class FileSystemController; namespace NS { +void EncryptSharedFont(const std::vector& input, std::vector& output, std::size_t& offset); + class PL_U final : public ServiceFramework { public: explicit PL_U(Core::System& system);