mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2024-11-06 04:01:44 +00:00
c7026b9094
* Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Updated AddOnContentLocationResolver and RegisteredLocationResolver to 9.0.0 * Finished updating lr to 9.0.0 * Updated NCM to 9.0.0 * Fix libstrat includes * Fixed application launching * title_id_2 -> owner_tid * Updated to new-ipc * Change to using pure virtuals * Title Id -> Program Id * Fixed compilation against master * std::scoped_lock<> -> std::scoped_lock * Adopted R_UNLESS and R_CONVERT * Prefix namespace to Results * Adopt std::numeric_limits * Fixed incorrect error handling in ReadFile * Adopted AMS_ABORT_UNLESS * Adopt util::GenerateUuid() * Syntax improvements * ncm_types: Address review * Address more review comments * Updated copyrights * Address more feedback * More feedback addressed * More changes * Move dispatch tables out of interface files * Addressed remaining comments * lr: move into libstratosphere * ncm: Fix logic inversion * lr: Add comments * lr: Remove whitespace * ncm: Start addressing feedback * ncm: Cleanup InitializeContentManager * lr: support client-side usage * lr_service -> lr_api * ncm: Begin refactoring content manager * ncm: More content manager improvements * ncm: Content manager mount improvements * ldr: use lr bindings * lr bindings usage: minor fixes * ncm/lr: Pointer placement * ncm: placeholder accessor cleanup * ncm: minor fixes * ncm: refactor rights cache * ncm: content meta database cleanup * ncm: move content meta database impl out of interface file * ncm: Use const ContentMetaKey & * ncm: fix other non-const ContentMetaKey references * ncm: content meta database cleanup * ncm: content storage fixes for 2.0.0 * ncm: add missing end of file newlines * ncm: implement ContentMetaReader * ncm: client-side api * ncm: trim trailing spaces * ncm: FS_MAX_PATH-1 -> fs::EntryNameLengthMax * ncm: Use PathString and Path * fs: implement accessor wrappers for ncm * fs: implement user fs wrappers * fs: add MountSdCard * ncm: move to content manager impl * ncm: fix up main * kvdb: use fs:: * fs: Add wrappers needed for ncm * ncm: use fs bindings, other refactoring * ncm: minor fixes * fsa: fix ReadFile without size output * fs: add substorage, rom path tool * ncm: fix dangling fsdev usage * fs: fix bug in Commit * fs: fixed incorrect mode check * fs: implement Mount(System)Data * ncm: don't delete hos * results: add R_SUCCEED_IF * ams-except-ncm: use R_SUCCEED_IF * ncm: added comments * ncm: fix api definitions * ncm: use R_SUCCEED_IF * pm: think of the savings * ncm: employ kernel strats * ncm: Nintendo has 5 MiB of heap. Give ourselves 4 to be safe, pending analysis * ncm: refactor IDs, split types header into many headers * ams.mitm: use fs bindings instead of stdio * fs: SystemData uses SystemDataId * ncm: improve meta-db accuracy * ncm: inline getlatestkey * fs: improve UnsupportedOperation results * fs: modernize mount utils * ams: misc fixes for merge-errors * fs: improve unsupportedoperation results * git subrepo pull emummc subrepo: subdir: "emummc" merged: "d12dd546" upstream: origin: "https://github.com/m4xw/emuMMC" branch: "develop" commit: "d12dd546" git-subrepo: version: "0.4.1" origin: "???" commit: "???" * util: add boundedmap * ncm: minor style fixes * ncm: don't unmount if mounting fails * lr: bug fixes * ncm: implement ncm.for-initialize + ncm.for-safemode * lr: ncm::ProgramId::Invalid -> ncm::InvalidProgramId * ncm: fix open directory mode on 1.0.0 * ncm: fix fs use, implement more of < 4.0.0 for-initialize/safemode * ncm: implement packagedcontent -> content for building metadb * ncm: fix save data flag management * ncm: address some review suggestions (thanks @leoetlino!) * updater: use fs bindings * fs: implement MountCode * fs: prefer make_unique to operator new * ncm: implement remaining ContentMetaDatabaseBuilder functionality Co-authored-by: Michael Scire <SciresM@gmail.com>
142 lines
5.6 KiB
C++
142 lines
5.6 KiB
C++
/*
|
|
* Copyright (c) 2018-2020 Atmosphère-NX
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "updater_bis_management.hpp"
|
|
|
|
namespace ams::updater {
|
|
|
|
Result BisAccessor::Initialize() {
|
|
return fs::OpenBisPartition(std::addressof(this->storage), this->partition_id);
|
|
}
|
|
|
|
void BisAccessor::Finalize() {
|
|
/* ... */
|
|
}
|
|
|
|
Result BisAccessor::Read(void *dst, size_t size, u64 offset) {
|
|
AMS_ABORT_UNLESS((offset % SectorAlignment) == 0);
|
|
return this->storage->Read(static_cast<u32>(offset), dst, size);
|
|
}
|
|
|
|
Result BisAccessor::Write(u64 offset, const void *src, size_t size) {
|
|
AMS_ABORT_UNLESS((offset % SectorAlignment) == 0);
|
|
return this->storage->Write(static_cast<u32>(offset), src, size);
|
|
}
|
|
|
|
Result BisAccessor::Write(u64 offset, size_t size, const char *bip_path, void *work_buffer, size_t work_buffer_size) {
|
|
AMS_ABORT_UNLESS((offset % SectorAlignment) == 0);
|
|
AMS_ABORT_UNLESS((work_buffer_size % SectorAlignment) == 0);
|
|
|
|
fs::FileHandle file;
|
|
R_TRY_CATCH(fs::OpenFile(std::addressof(file), bip_path, fs::OpenMode_Read)) {
|
|
R_CONVERT(fs::ResultPathNotFound, ResultInvalidBootImagePackage())
|
|
} R_END_TRY_CATCH;
|
|
ON_SCOPE_EXIT { fs::CloseFile(file); };
|
|
|
|
size_t written = 0;
|
|
while (true) {
|
|
std::memset(work_buffer, 0, work_buffer_size);
|
|
size_t read_size;
|
|
R_TRY(fs::ReadFile(std::addressof(read_size), file, written, work_buffer, work_buffer_size, fs::ReadOption()));
|
|
AMS_ABORT_UNLESS(written + read_size <= size);
|
|
|
|
size_t aligned_size = ((read_size + SectorAlignment - 1) / SectorAlignment) * SectorAlignment;
|
|
R_TRY(this->Write(offset + written, work_buffer, aligned_size));
|
|
written += read_size;
|
|
|
|
if (read_size != work_buffer_size) {
|
|
break;
|
|
}
|
|
}
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result BisAccessor::Clear(u64 offset, u64 size, void *work_buffer, size_t work_buffer_size) {
|
|
AMS_ABORT_UNLESS((offset % SectorAlignment) == 0);
|
|
AMS_ABORT_UNLESS((work_buffer_size % SectorAlignment) == 0);
|
|
|
|
std::memset(work_buffer, 0, work_buffer_size);
|
|
|
|
size_t written = 0;
|
|
while (written < size) {
|
|
size_t cur_write_size = std::min(work_buffer_size, size - written);
|
|
R_TRY(this->Write(offset + written, work_buffer, cur_write_size));
|
|
written += cur_write_size;
|
|
}
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result BisAccessor::GetHash(void *dst, u64 offset, u64 size, u64 hash_size, void *work_buffer, size_t work_buffer_size) {
|
|
AMS_ABORT_UNLESS((offset % SectorAlignment) == 0);
|
|
AMS_ABORT_UNLESS((work_buffer_size % SectorAlignment) == 0);
|
|
|
|
crypto::Sha256Generator generator;
|
|
generator.Initialize();
|
|
|
|
size_t total_read = 0;
|
|
while (total_read < hash_size) {
|
|
size_t cur_read_size = std::min(work_buffer_size, size - total_read);
|
|
size_t cur_update_size = std::min(cur_read_size, hash_size - total_read);
|
|
R_TRY(this->Read(work_buffer, cur_read_size, offset + total_read));
|
|
generator.Update(work_buffer, cur_update_size);
|
|
|
|
total_read += cur_read_size;
|
|
}
|
|
generator.GetHash(dst, hash_size);
|
|
|
|
return ResultSuccess();
|
|
}
|
|
|
|
size_t Boot0Accessor::GetBootloaderVersion(void *bct) {
|
|
u32 version = *reinterpret_cast<u32 *>(reinterpret_cast<uintptr_t>(bct) + BctVersionOffset);
|
|
AMS_ABORT_UNLESS(version <= BctVersionMax);
|
|
return static_cast<size_t>(version);
|
|
}
|
|
|
|
size_t Boot0Accessor::GetEksIndex(size_t bootloader_version) {
|
|
AMS_ABORT_UNLESS(bootloader_version <= BctVersionMax);
|
|
return (bootloader_version > 0) ? bootloader_version - 1 : 0;
|
|
}
|
|
|
|
void Boot0Accessor::CopyEks(void *dst_bct, const void *src_eks, size_t eks_index) {
|
|
std::memcpy(reinterpret_cast<u8 *>(dst_bct) + BctEksOffset, reinterpret_cast<const u8 *>(src_eks) + eks_index * EksEntrySize, EksBlobSize);
|
|
}
|
|
|
|
Result Boot0Accessor::UpdateEks(void *dst_bct, void *eks_work_buffer) {
|
|
size_t read_size;
|
|
R_TRY(this->Read(&read_size, eks_work_buffer, EksSize, Boot0Partition::Eks));
|
|
|
|
return this->UpdateEksManually(dst_bct, eks_work_buffer);
|
|
}
|
|
|
|
Result Boot0Accessor::UpdateEksManually(void *dst_bct, const void *src_eks) {
|
|
this->CopyEks(dst_bct, src_eks, GetEksIndex(GetBootloaderVersion(dst_bct)));
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result Boot0Accessor::PreserveAutoRcm(void *dst_bct, void *work_buffer, Boot0Partition which) {
|
|
std::memset(work_buffer, 0, BctSize);
|
|
|
|
size_t read_size;
|
|
R_TRY(this->Read(&read_size, work_buffer, BctSize, which));
|
|
|
|
void *dst_pubk = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(dst_bct) + BctPubkOffset);
|
|
void *src_pubk = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + BctPubkOffset);
|
|
std::memcpy(dst_pubk, src_pubk, BctPubkSize);
|
|
|
|
return ResultSuccess();
|
|
}
|
|
|
|
}
|