OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ams: support building unit test programs on windows/linux/macos

Browse Source
This commit is contained in:
Michael Scire
2022-03-06 12:08:20 -08:00
committed by SciresM
parent 9a38be201a
commit 64a97576d0
756 changed files with 33359 additions and 9372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/libstratosphere/source/updater/updater_api.cpp
View File

@@ -297,6 +297,7 @@ namespace ams::updater {
}
/* Only preserve autorcm if on a unit with unpatched rcm bug. */
#if defined(ATMOSPHERE_BOARD_NINTENDO_NX)
if (HasAutoRcmPreserve(boot_image_update_type) && !exosphere::IsRcmBugPatched()) {
R_TRY(boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctNormalSub));
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalSub));
@@ -305,6 +306,9 @@ namespace ams::updater {
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalMain));
}
} else {
#else
{
#endif
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalSub));
if (!custom_public_key) {
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalMain));
@@ -366,6 +370,7 @@ namespace ams::updater {
R_TRY(boot0_accessor.UpdateEks(bct, work));
}
/* Only preserve autorcm if on a unit with unpatched rcm bug. */
#if defined(ATMOSPHERE_BOARD_NINTENDO_NX)
if (HasAutoRcmPreserve(boot_image_update_type) && !exosphere::IsRcmBugPatched()) {
R_TRY(boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctSafeSub));
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeSub));
@@ -374,6 +379,9 @@ namespace ams::updater {
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeMain));
}
} else {
#else
{
#endif
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeSub));
if (!custom_public_key) {
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeMain));
@@ -428,7 +436,7 @@ namespace ams::updater {
}
u8 file_hash[crypto::Sha256Generator::HashSize];
crypto::GenerateSha256Hash(file_hash, sizeof(file_hash), bct, BctSize);
crypto::GenerateSha256(file_hash, sizeof(file_hash), bct, BctSize);
return CompareHash(file_hash, stored_hash, sizeof(file_hash));
}

6
libraries/libstratosphere/source/updater/updater_bis_management.cpp
View File

@@ -102,7 +102,7 @@ namespace ams::updater {
size_t written = 0;
while (written < size) {
size_t cur_write_size = std::min(work_buffer_size, size - written);
size_t cur_write_size = std::min<size_t>(work_buffer_size, size - written);
R_TRY(this->Write(offset + written, work_buffer, cur_write_size));
written += cur_write_size;
}
@@ -118,8 +118,8 @@ namespace ams::updater {
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);
size_t cur_read_size = std::min<size_t>(work_buffer_size, size - total_read);
size_t cur_update_size = std::min<size_t>(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);