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

erpt: Add basic (TODO-impl post-prerelease) support for 17.0.0 changes

Browse Source
This commit is contained in:
Michael Scire
2023-10-11 13:32:22 -07:00
committed by SciresM
parent 9d4cb685a7
commit aa170a72a9
15 changed files with 1487 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/libstratosphere/source/erpt/srv/erpt_srv_cipher.hpp
View File

@@ -48,7 +48,7 @@ namespace ams::erpt::srv {
ON_SCOPE_EXIT { Deallocate(hdr); };
hdr->magic = HeaderMagic;
hdr->field_type = static_cast<u32>(FieldToTypeMap[field_id]);
hdr->field_type = static_cast<u32>(ConvertFieldToType(field_id));
hdr->element_count = arr_size;
hdr->reserved = 0;
@@ -81,7 +81,7 @@ namespace ams::erpt::srv {
oaep.Encrypt(cipher, sizeof(cipher), s_key, sizeof(s_key), salt, sizeof(salt));
}
Formatter::AddField(report, FieldId_CipherKey, cipher, sizeof(cipher));
Formatter::AddField(report, ERPT_FIELD_ID(CipherKey), cipher, sizeof(cipher));
std::memset(s_key, 0, sizeof(s_key));
R_RETURN(Formatter::End(report));
@@ -97,7 +97,7 @@ namespace ams::erpt::srv {
}
static Result AddField(Report *report, FieldId field_id, char *str, u32 len) {
if (FieldToFlagMap[field_id] == FieldFlag_Encrypt) {
if (ConvertFieldToFlag(field_id) == FieldFlag_Encrypt) {
R_RETURN(EncryptArray<char>(report, field_id, str, len));
} else {
R_RETURN(Formatter::AddField(report, field_id, str, len));
@@ -105,7 +105,7 @@ namespace ams::erpt::srv {
}
static Result AddField(Report *report, FieldId field_id, u8 *bin, u32 len) {
if (FieldToFlagMap[field_id] == FieldFlag_Encrypt) {
if (ConvertFieldToFlag(field_id) == FieldFlag_Encrypt) {
R_RETURN(EncryptArray<u8>(report, field_id, bin, len));
} else {
R_RETURN(Formatter::AddField(report, field_id, bin, len));
@@ -114,7 +114,7 @@ namespace ams::erpt::srv {
template<typename T>
static Result AddField(Report *report, FieldId field_id, T *arr, u32 len) {
if (FieldToFlagMap[field_id] == FieldFlag_Encrypt) {
if (ConvertFieldToFlag(field_id) == FieldFlag_Encrypt) {
R_RETURN(EncryptArray<T>(report, field_id, arr, len));
} else {
R_RETURN(Formatter::AddField<T>(report, field_id, arr, len));