boot: refactor for R_TRY
This commit is contained in:
@@ -80,28 +80,20 @@ u32 Updater::GetNcmTitleType(BootModeType mode) {
|
||||
}
|
||||
|
||||
Result Updater::GetVerificationState(VerificationState *out, void *work_buffer, size_t work_buffer_size) {
|
||||
Result rc;
|
||||
|
||||
/* Always set output to true before doing anything else. */
|
||||
out->needs_verify_normal = true;
|
||||
out->needs_verify_safe = true;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
/* Initialize boot0 save accessor. */
|
||||
BisSave save;
|
||||
if (R_FAILED((rc = save.Initialize(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(save.Initialize(work_buffer, work_buffer_size));
|
||||
ON_SCOPE_EXIT { save.Finalize(); };
|
||||
|
||||
/* Load save from NAND. */
|
||||
if (R_FAILED((rc = save.Load()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(save.Load());
|
||||
|
||||
/* Read data from save. */
|
||||
out->needs_verify_normal = save.GetNeedsVerification(BootModeType_Normal);
|
||||
@@ -110,22 +102,17 @@ Result Updater::GetVerificationState(VerificationState *out, void *work_buffer,
|
||||
}
|
||||
|
||||
Result Updater::VerifyBootImagesAndRepairIfNeeded(bool *out_repaired_normal, bool *out_repaired_safe, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
/* Always set output to false before doing anything else. */
|
||||
*out_repaired_normal = false;
|
||||
*out_repaired_safe = false;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
/* Get verification state from NAND. */
|
||||
VerificationState verification_state;
|
||||
if (R_FAILED((rc = GetVerificationState(&verification_state, work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetVerificationState(&verification_state, work_buffer, work_buffer_size));
|
||||
|
||||
/* If we don't need to verify anything, we're done. */
|
||||
if (!verification_state.needs_verify_normal && !verification_state.needs_verify_safe) {
|
||||
@@ -142,58 +129,43 @@ Result Updater::VerifyBootImagesAndRepairIfNeeded(bool *out_repaired_normal, boo
|
||||
|
||||
/* Verify normal, verify safe as needed. */
|
||||
if (verification_state.needs_verify_normal) {
|
||||
rc = VerifyBootImagesAndRepairIfNeeded(out_repaired_normal, BootModeType_Normal, work_buffer, work_buffer_size, boot_image_update_type);
|
||||
if (rc == ResultUpdaterBootImagePackageNotFound) {
|
||||
/* Nintendo considers failure to locate bip a success. TODO: don't do that? */
|
||||
rc = ResultSuccess;
|
||||
}
|
||||
if (R_FAILED(rc)) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY_CATCH(VerifyBootImagesAndRepairIfNeeded(out_repaired_normal, BootModeType_Normal, work_buffer, work_buffer_size, boot_image_update_type)) {
|
||||
R_CATCH(ResultUpdaterBootImagePackageNotFound) {
|
||||
/* Nintendo considers failure to locate bip a success. TODO: don't do that? */
|
||||
}
|
||||
} R_END_TRY_CATCH;
|
||||
}
|
||||
|
||||
if (verification_state.needs_verify_safe) {
|
||||
rc = VerifyBootImagesAndRepairIfNeeded(out_repaired_safe, BootModeType_Safe, work_buffer, work_buffer_size, boot_image_update_type);
|
||||
if (rc == ResultUpdaterBootImagePackageNotFound) {
|
||||
/* Nintendo considers failure to locate bip a success. TODO: don't do that? */
|
||||
rc = ResultSuccess;
|
||||
}
|
||||
if (R_FAILED(rc)) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY_CATCH(VerifyBootImagesAndRepairIfNeeded(out_repaired_safe, BootModeType_Safe, work_buffer, work_buffer_size, boot_image_update_type)) {
|
||||
R_CATCH(ResultUpdaterBootImagePackageNotFound) {
|
||||
/* Nintendo considers failure to locate bip a success. TODO: don't do that? */
|
||||
}
|
||||
} R_END_TRY_CATCH;
|
||||
}
|
||||
|
||||
return ResultSuccess;
|
||||
}
|
||||
|
||||
Result Updater::VerifyBootImagesAndRepairIfNeeded(bool *out_repaired, BootModeType mode, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
/* Get system data id for boot images (819/81A/81B/81C). */
|
||||
u64 bip_data_id;
|
||||
if (R_FAILED((rc = GetBootImagePackageDataId(&bip_data_id, mode, work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetBootImagePackageDataId(&bip_data_id, mode, work_buffer, work_buffer_size));
|
||||
|
||||
/* Verify the boot images in NAND. */
|
||||
if (R_FAILED((rc = VerifyBootImages(bip_data_id, mode, work_buffer, work_buffer_size, boot_image_update_type)))) {
|
||||
/* If we failed for a reason other than repair needed, bail out. */
|
||||
if (rc != ResultUpdaterNeedsRepairBootImages) {
|
||||
return rc;
|
||||
R_TRY_CATCH(VerifyBootImages(bip_data_id, mode, work_buffer, work_buffer_size, boot_image_update_type)) {
|
||||
R_CATCH(ResultUpdaterNeedsRepairBootImages) {
|
||||
/* Perform repair. */
|
||||
*out_repaired = true;
|
||||
R_TRY(UpdateBootImages(bip_data_id, mode, work_buffer, work_buffer_size, boot_image_update_type));
|
||||
}
|
||||
/* Perform repair. */
|
||||
*out_repaired = true;
|
||||
if (R_FAILED((rc = UpdateBootImages(bip_data_id, mode, work_buffer, work_buffer_size, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
} R_END_TRY_CATCH;
|
||||
|
||||
/* We've either just verified or just repaired. Either way, we don't need to verify any more. */
|
||||
return SetVerificationNeeded(mode, false, work_buffer, work_buffer_size);
|
||||
}
|
||||
|
||||
Result Updater::GetBootImagePackageDataId(u64 *out_data_id, BootModeType mode, void *work_buffer, size_t work_buffer_size) {
|
||||
Result rc;
|
||||
|
||||
/* Ensure we can read content metas. */
|
||||
constexpr size_t MaxContentMetas = 0x40;
|
||||
if (work_buffer_size < sizeof(NcmMetaRecord) * MaxContentMetas) {
|
||||
@@ -202,9 +174,7 @@ Result Updater::GetBootImagePackageDataId(u64 *out_data_id, BootModeType mode, v
|
||||
|
||||
/* Open NAND System meta database, list contents. */
|
||||
NcmContentMetaDatabase meta_db;
|
||||
if (R_FAILED((rc = ncmOpenContentMetaDatabase(FsStorageId_NandSystem, &meta_db)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ncmOpenContentMetaDatabase(FsStorageId_NandSystem, &meta_db));
|
||||
ON_SCOPE_EXIT { serviceClose(&meta_db.s); };
|
||||
|
||||
NcmMetaRecord *records = reinterpret_cast<NcmMetaRecord *>(work_buffer);
|
||||
@@ -212,9 +182,7 @@ Result Updater::GetBootImagePackageDataId(u64 *out_data_id, BootModeType mode, v
|
||||
const u32 title_type = GetNcmTitleType(mode);
|
||||
u32 written_entries;
|
||||
u32 total_entries;
|
||||
if (R_FAILED((rc = ncmContentMetaDatabaseList(&meta_db, title_type, 0, 0, UINT64_MAX, records, MaxContentMetas * sizeof(*records), &written_entries, &total_entries)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ncmContentMetaDatabaseList(&meta_db, title_type, 0, 0, UINT64_MAX, records, MaxContentMetas * sizeof(*records), &written_entries, &total_entries));
|
||||
if (total_entries == 0) {
|
||||
return ResultUpdaterBootImagePackageNotFound;
|
||||
}
|
||||
@@ -227,9 +195,7 @@ Result Updater::GetBootImagePackageDataId(u64 *out_data_id, BootModeType mode, v
|
||||
if (total_entries > 1) {
|
||||
for (size_t i = 0; i < total_entries; i++) {
|
||||
u8 attr;
|
||||
if (R_FAILED((rc = ncmContentMetaDatabaseGetAttributes(&meta_db, &records[i], &attr)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ncmContentMetaDatabaseGetAttributes(&meta_db, &records[i], &attr));
|
||||
|
||||
if (attr & NcmContentMetaAttribute_Exfat) {
|
||||
*out_data_id = records[i].titleId;
|
||||
@@ -255,29 +221,19 @@ Result Updater::VerifyBootImages(u64 data_id, BootModeType mode, void *work_buff
|
||||
}
|
||||
|
||||
Result Updater::ValidateBctFileHash(Boot0Accessor &accessor, Boot0Partition which, const void *stored_hash, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
void *bct = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + 0);
|
||||
void *work = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + BctSize);
|
||||
|
||||
size_t size;
|
||||
if (R_FAILED((rc = ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type))))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
|
||||
if (HasEks(boot_image_update_type)) {
|
||||
if (R_FAILED((rc = accessor.UpdateEks(bct, work)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(accessor.UpdateEks(bct, work));
|
||||
}
|
||||
if (HasAutoRcmPreserve(boot_image_update_type)) {
|
||||
if (R_FAILED((rc = accessor.PreserveAutoRcm(bct, work, which)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(accessor.PreserveAutoRcm(bct, work, which));
|
||||
}
|
||||
|
||||
u8 file_hash[SHA256_HASH_SIZE];
|
||||
@@ -291,19 +247,14 @@ Result Updater::ValidateBctFileHash(Boot0Accessor &accessor, Boot0Partition whic
|
||||
}
|
||||
|
||||
Result Updater::VerifyBootImagesNormal(u64 data_id, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
if (R_FAILED((rc = romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())))) {
|
||||
if (rc == ResultFsTargetNotFound) {
|
||||
R_TRY_CATCH(romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())) {
|
||||
R_CATCH(ResultFsTargetNotFound) {
|
||||
return ResultUpdaterBootImagePackageNotFound;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
} R_END_TRY_CATCH;
|
||||
ON_SCOPE_EXIT { if (R_FAILED(romfsUnmount(GetBootImagePackageMountPath()))) { std::abort(); } };
|
||||
|
||||
/* Read and validate hashes of boot images. */
|
||||
@@ -313,57 +264,35 @@ Result Updater::VerifyBootImagesNormal(u64 data_id, void *work_buffer, size_t wo
|
||||
u8 file_hash[SHA256_HASH_SIZE];
|
||||
|
||||
Boot0Accessor boot0_accessor;
|
||||
if (R_FAILED((rc = boot0_accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Initialize());
|
||||
ON_SCOPE_EXIT { boot0_accessor.Finalize(); };
|
||||
|
||||
/* Compare BCT hashes. */
|
||||
if (R_FAILED((rc = boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctNormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = ValidateBctFileHash(boot0_accessor, Boot0Partition::BctNormalMain, nand_hash, work_buffer, work_buffer_size, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctNormalMain));
|
||||
R_TRY(ValidateBctFileHash(boot0_accessor, Boot0Partition::BctNormalMain, nand_hash, work_buffer, work_buffer_size, boot_image_update_type));
|
||||
|
||||
/* Compare BCT Sub hashes. */
|
||||
if (R_FAILED((rc = boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctNormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = ValidateBctFileHash(boot0_accessor, Boot0Partition::BctNormalSub, nand_hash, work_buffer, work_buffer_size, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctNormalSub));
|
||||
R_TRY(ValidateBctFileHash(boot0_accessor, Boot0Partition::BctNormalSub, nand_hash, work_buffer, work_buffer_size, boot_image_update_type));
|
||||
|
||||
/* Compare Package1 Normal/Sub hashes. */
|
||||
if (R_FAILED((rc = GetFileHash(&size, file_hash, GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot0Partition::Package1NormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetFileHash(&size, file_hash, GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size));
|
||||
R_TRY(boot0_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot0Partition::Package1NormalMain));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot0Partition::Package1NormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot0Partition::Package1NormalSub));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
|
||||
/* Compare Package2 Normal/Sub hashes. */
|
||||
if (R_FAILED((rc = GetFileHash(&size, file_hash, GetPackage2Path(boot_image_update_type), work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::NormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetFileHash(&size, file_hash, GetPackage2Path(boot_image_update_type), work_buffer, work_buffer_size));
|
||||
R_TRY(GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::NormalMain));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
if (R_FAILED((rc = GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::NormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::NormalSub));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
@@ -373,19 +302,14 @@ Result Updater::VerifyBootImagesNormal(u64 data_id, void *work_buffer, size_t wo
|
||||
}
|
||||
|
||||
Result Updater::VerifyBootImagesSafe(u64 data_id, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
if (R_FAILED((rc = romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())))) {
|
||||
if (rc == ResultFsTargetNotFound) {
|
||||
R_TRY_CATCH(romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())) {
|
||||
R_CATCH(ResultFsTargetNotFound) {
|
||||
return ResultUpdaterBootImagePackageNotFound;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
} R_END_TRY_CATCH;
|
||||
ON_SCOPE_EXIT { if (R_FAILED(romfsUnmount(GetBootImagePackageMountPath()))) { std::abort(); } };
|
||||
|
||||
/* Read and validate hashes of boot images. */
|
||||
@@ -395,64 +319,40 @@ Result Updater::VerifyBootImagesSafe(u64 data_id, void *work_buffer, size_t work
|
||||
u8 file_hash[SHA256_HASH_SIZE];
|
||||
|
||||
Boot0Accessor boot0_accessor;
|
||||
if (R_FAILED((rc = boot0_accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Initialize());
|
||||
ON_SCOPE_EXIT { boot0_accessor.Finalize(); };
|
||||
|
||||
Boot1Accessor boot1_accessor;
|
||||
if (R_FAILED((rc = boot1_accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot1_accessor.Initialize());
|
||||
ON_SCOPE_EXIT { boot1_accessor.Finalize(); };
|
||||
|
||||
|
||||
/* Compare BCT hashes. */
|
||||
if (R_FAILED((rc = boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctSafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = ValidateBctFileHash(boot0_accessor, Boot0Partition::BctSafeMain, nand_hash, work_buffer, work_buffer_size, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctSafeMain));
|
||||
R_TRY(ValidateBctFileHash(boot0_accessor, Boot0Partition::BctSafeMain, nand_hash, work_buffer, work_buffer_size, boot_image_update_type));
|
||||
|
||||
/* Compare BCT Sub hashes. */
|
||||
if (R_FAILED((rc = boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctSafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = ValidateBctFileHash(boot0_accessor, Boot0Partition::BctSafeSub, nand_hash, work_buffer, work_buffer_size, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.GetHash(nand_hash, BctSize, work_buffer, work_buffer_size, Boot0Partition::BctSafeSub));
|
||||
R_TRY(ValidateBctFileHash(boot0_accessor, Boot0Partition::BctSafeSub, nand_hash, work_buffer, work_buffer_size, boot_image_update_type));
|
||||
|
||||
/* Compare Package1 Normal/Sub hashes. */
|
||||
if (R_FAILED((rc = GetFileHash(&size, file_hash, GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot1_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot1Partition::Package1SafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetFileHash(&size, file_hash, GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size));
|
||||
R_TRY(boot1_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot1Partition::Package1SafeMain));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
if (R_FAILED((rc = boot1_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot1Partition::Package1SafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot1_accessor.GetHash(nand_hash, size, work_buffer, work_buffer_size, Boot1Partition::Package1SafeSub));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
|
||||
/* Compare Package2 Normal/Sub hashes. */
|
||||
if (R_FAILED((rc = GetFileHash(&size, file_hash, GetPackage2Path(boot_image_update_type), work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::SafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetFileHash(&size, file_hash, GetPackage2Path(boot_image_update_type), work_buffer, work_buffer_size));
|
||||
R_TRY(GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::SafeMain));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
if (R_FAILED((rc = GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::SafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(GetPackage2Hash(nand_hash, size, work_buffer, work_buffer_size, Package2Type::SafeSub));
|
||||
if (std::memcmp(file_hash, nand_hash, SHA256_HASH_SIZE) != 0) {
|
||||
return ResultUpdaterNeedsRepairBootImages;
|
||||
}
|
||||
@@ -473,40 +373,27 @@ Result Updater::UpdateBootImages(u64 data_id, BootModeType mode, void *work_buff
|
||||
}
|
||||
|
||||
Result Updater::UpdateBootImagesNormal(u64 data_id, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
if (R_FAILED((rc = romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())))) {
|
||||
if (rc == ResultFsTargetNotFound) {
|
||||
R_TRY_CATCH(romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())) {
|
||||
R_CATCH(ResultFsTargetNotFound) {
|
||||
return ResultUpdaterBootImagePackageNotFound;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
} R_END_TRY_CATCH;
|
||||
ON_SCOPE_EXIT { if (R_FAILED(romfsUnmount(GetBootImagePackageMountPath()))) { std::abort(); } };
|
||||
|
||||
{
|
||||
Boot0Accessor boot0_accessor;
|
||||
if (R_FAILED((rc = boot0_accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Initialize());
|
||||
ON_SCOPE_EXIT { boot0_accessor.Finalize(); };
|
||||
|
||||
/* Write Package1 sub. */
|
||||
if (R_FAILED((rc = boot0_accessor.Clear(work_buffer, work_buffer_size, Boot0Partition::Package1NormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot0Partition::Package1NormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Clear(work_buffer, work_buffer_size, Boot0Partition::Package1NormalSub));
|
||||
R_TRY(boot0_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot0Partition::Package1NormalSub));
|
||||
|
||||
/* Write Package2 sub. */
|
||||
if (R_FAILED((rc = WritePackage2(work_buffer, work_buffer_size, Package2Type::NormalSub, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(WritePackage2(work_buffer, work_buffer_size, Package2Type::NormalSub, boot_image_update_type));
|
||||
|
||||
/* Write BCT sub + BCT main, in that order. */
|
||||
{
|
||||
@@ -514,98 +401,61 @@ Result Updater::UpdateBootImagesNormal(u64 data_id, void *work_buffer, size_t wo
|
||||
void *work = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + BctSize);
|
||||
|
||||
size_t size;
|
||||
if (R_FAILED((rc = ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type))))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
|
||||
if (HasEks(boot_image_update_type)) {
|
||||
if (R_FAILED((rc = boot0_accessor.UpdateEks(bct, work)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.UpdateEks(bct, work));
|
||||
}
|
||||
|
||||
/* Only preserve autorcm if on a unit with unpatched rcm bug. */
|
||||
if (HasAutoRcmPreserve(boot_image_update_type) && !IsRcmBugPatched()) {
|
||||
if (R_FAILED((rc = boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctNormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctNormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctNormalSub));
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalSub));
|
||||
R_TRY(boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctNormalMain));
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalMain));
|
||||
} else {
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalSub));
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctNormalMain));
|
||||
}
|
||||
}
|
||||
|
||||
/* Write Package2 main. */
|
||||
if (R_FAILED((rc = WritePackage2(work_buffer, work_buffer_size, Package2Type::NormalMain, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(WritePackage2(work_buffer, work_buffer_size, Package2Type::NormalMain, boot_image_update_type));
|
||||
|
||||
/* Write Package1 main. */
|
||||
if (R_FAILED((rc = boot0_accessor.Clear(work_buffer, work_buffer_size, Boot0Partition::Package1NormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot0Partition::Package1NormalMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Clear(work_buffer, work_buffer_size, Boot0Partition::Package1NormalMain));
|
||||
R_TRY(boot0_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot0Partition::Package1NormalMain));
|
||||
}
|
||||
|
||||
return ResultSuccess;
|
||||
}
|
||||
|
||||
Result Updater::UpdateBootImagesSafe(u64 data_id, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
if (R_FAILED((rc = romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())))) {
|
||||
if (rc == ResultFsTargetNotFound) {
|
||||
R_TRY_CATCH(romfsMountFromDataArchive(data_id, FsStorageId_NandSystem, GetBootImagePackageMountPath())) {
|
||||
R_CATCH(ResultFsTargetNotFound) {
|
||||
return ResultUpdaterBootImagePackageNotFound;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
} R_END_TRY_CATCH;
|
||||
ON_SCOPE_EXIT { if (R_FAILED(romfsUnmount(GetBootImagePackageMountPath()))) { std::abort(); } };
|
||||
|
||||
{
|
||||
Boot0Accessor boot0_accessor;
|
||||
if (R_FAILED((rc = boot0_accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Initialize());
|
||||
ON_SCOPE_EXIT { boot0_accessor.Finalize(); };
|
||||
|
||||
Boot1Accessor boot1_accessor;
|
||||
if (R_FAILED((rc = boot1_accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot1_accessor.Initialize());
|
||||
ON_SCOPE_EXIT { boot1_accessor.Finalize(); };
|
||||
|
||||
|
||||
/* Write Package1 sub. */
|
||||
if (R_FAILED((rc = boot1_accessor.Clear(work_buffer, work_buffer_size, Boot1Partition::Package1SafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot1_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot1Partition::Package1SafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot1_accessor.Clear(work_buffer, work_buffer_size, Boot1Partition::Package1SafeSub));
|
||||
R_TRY(boot1_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot1Partition::Package1SafeSub));
|
||||
|
||||
/* Write Package2 sub. */
|
||||
if (R_FAILED((rc = WritePackage2(work_buffer, work_buffer_size, Package2Type::SafeSub, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(WritePackage2(work_buffer, work_buffer_size, Package2Type::SafeSub, boot_image_update_type));
|
||||
|
||||
/* Write BCT sub + BCT main, in that order. */
|
||||
{
|
||||
@@ -613,103 +463,63 @@ Result Updater::UpdateBootImagesSafe(u64 data_id, void *work_buffer, size_t work
|
||||
void *work = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + BctSize);
|
||||
|
||||
size_t size;
|
||||
if (R_FAILED((rc = ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type))))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
|
||||
if (HasEks(boot_image_update_type)) {
|
||||
if (R_FAILED((rc = boot0_accessor.UpdateEks(bct, work)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.UpdateEks(bct, work));
|
||||
}
|
||||
/* Only preserve autorcm if on a unit with unpatched rcm bug. */
|
||||
if (HasAutoRcmPreserve(boot_image_update_type) && !IsRcmBugPatched()) {
|
||||
if (R_FAILED((rc = boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctSafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctSafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctSafeSub));
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeSub));
|
||||
R_TRY(boot0_accessor.PreserveAutoRcm(bct, work, Boot0Partition::BctSafeMain));
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeMain));
|
||||
} else {
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeSub)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeSub));
|
||||
R_TRY(boot0_accessor.Write(bct, BctSize, Boot0Partition::BctSafeMain));
|
||||
}
|
||||
}
|
||||
|
||||
/* Write Package2 main. */
|
||||
if (R_FAILED((rc = WritePackage2(work_buffer, work_buffer_size, Package2Type::SafeMain, boot_image_update_type)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(WritePackage2(work_buffer, work_buffer_size, Package2Type::SafeMain, boot_image_update_type));
|
||||
|
||||
/* Write Package1 main. */
|
||||
if (R_FAILED((rc = boot1_accessor.Clear(work_buffer, work_buffer_size, Boot1Partition::Package1SafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
if (R_FAILED((rc = boot1_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot1Partition::Package1SafeMain)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(boot1_accessor.Clear(work_buffer, work_buffer_size, Boot1Partition::Package1SafeMain));
|
||||
R_TRY(boot1_accessor.Write(GetPackage1Path(boot_image_update_type), work_buffer, work_buffer_size, Boot1Partition::Package1SafeMain));
|
||||
}
|
||||
|
||||
return ResultSuccess;
|
||||
}
|
||||
|
||||
Result Updater::SetVerificationNeeded(BootModeType mode, bool needed, void *work_buffer, size_t work_buffer_size) {
|
||||
Result rc;
|
||||
|
||||
/* Ensure work buffer is big enough for us to do what we want to do. */
|
||||
if (R_FAILED((rc = ValidateWorkBuffer(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(ValidateWorkBuffer(work_buffer, work_buffer_size));
|
||||
|
||||
/* Initialize boot0 save accessor. */
|
||||
BisSave save;
|
||||
if (R_FAILED((rc = save.Initialize(work_buffer, work_buffer_size)))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(save.Initialize(work_buffer, work_buffer_size));
|
||||
ON_SCOPE_EXIT { save.Finalize(); };
|
||||
|
||||
/* Load save from NAND. */
|
||||
if (R_FAILED((rc = save.Load()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(save.Load());
|
||||
|
||||
/* Set whether we need to verify, then save to nand. */
|
||||
save.SetNeedsVerification(mode, needed);
|
||||
if (R_FAILED((rc = save.Save()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(save.Save());
|
||||
|
||||
return ResultSuccess;
|
||||
}
|
||||
|
||||
Result Updater::GetPackage2Hash(void *dst_hash, size_t package2_size, void *work_buffer, size_t work_buffer_size, Package2Type which) {
|
||||
Result rc;
|
||||
|
||||
Package2Accessor accessor(which);
|
||||
if (R_FAILED((rc = accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(accessor.Initialize());
|
||||
ON_SCOPE_EXIT { accessor.Finalize(); };
|
||||
|
||||
return accessor.GetHash(dst_hash, package2_size, work_buffer, work_buffer_size, Package2Partition::Package2);
|
||||
}
|
||||
|
||||
Result Updater::WritePackage2(void *work_buffer, size_t work_buffer_size, Package2Type which, BootImageUpdateType boot_image_update_type) {
|
||||
Result rc;
|
||||
|
||||
Package2Accessor accessor(which);
|
||||
if (R_FAILED((rc = accessor.Initialize()))) {
|
||||
return rc;
|
||||
}
|
||||
R_TRY(accessor.Initialize());
|
||||
ON_SCOPE_EXIT { accessor.Finalize(); };
|
||||
|
||||
return accessor.Write(GetPackage2Path(boot_image_update_type), work_buffer, work_buffer_size, Package2Partition::Package2);
|
||||
|
||||
Reference in New Issue
Block a user