mika/switch-tools
1
0
Fork 0
mirror of https://github.com/switchbrew/switch-tools.git synced 2025-06-24 14:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

add content and save data owner parsing

Browse Source
This commit is contained in:
HookedBehemoth 2020-06-05 11:51:01 +02:00
parent e607ced3e2
commit 1943ce60cd
1 changed files with 92 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/npdmtool.c
View File

@ -19,20 +19,28 @@ typedef uint8_t u8;
/* FAC, FAH need to be tightly packed. */
#pragma pack(push, 1)
typedef struct {
u32 Version;
u8 Version;
u8 CoiCount;
u8 SdoiCount;
u8 pad;
u64 Perms;
u8 _0xC[0x20];
u64 CoiMin;
u64 CoiMax;
u64 SdoiMin;
u64 SdoiMax;
} FilesystemAccessControl;
#pragma pack(pop)
_Static_assert(sizeof(FilesystemAccessControl) == 0x2c, "size");
#pragma pack(push, 1)
typedef struct {
u32 Version;
u64 Perms;
u32 _0xC;
u32 _0x10;
u32 _0x14;
u32 _0x18;
u32 CoiOffset;
u32 CoiSize;
u32 SdoiOffset;
u32 SdoiSize;
} FilesystemAccessHeader;
#pragma pack(pop)
@ -284,6 +292,10 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
const cJSON *service = NULL;
const cJSON *services = NULL;
const cJSON *fsaccess = NULL;
const cJSON *cois = NULL;
const cJSON *coi = NULL;
const cJSON *sdois = NULL;
const cJSON *sdoi = NULL;
int status = 0;
cJSON *npdm_json = cJSON_Parse(json);
@ -400,20 +412,88 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
status = 0;
goto NPDM_BUILD_END;
}
cJSON_GetU64(fsaccess, "content_owner_id_min", &fac->CoiMin);
cJSON_GetU64(fsaccess, "content_owner_id_max", &fac->CoiMax);
cois = cJSON_GetObjectItemCaseSensitive(fsaccess, "content_owner_ids");
if (cJSON_IsArray(cois)) {
int idx = 0;
u64 *content_owner_id = (u64 *)((u8 *)fac + sizeof(FilesystemAccessControl));
cJSON_ArrayForEach(coi, cois) {
if (!cJSON_GetU64FromObjectValue(coi, content_owner_id)) {
status = 0;
goto NPDM_BUILD_END;
}
++content_owner_id;
++idx;
}
fac->CoiCount = idx;
}
cJSON_GetU64(fsaccess, "save_data_owner_id_min", &fac->SdoiMin);
cJSON_GetU64(fsaccess, "save_data_owner_id_max", &fac->SdoiMax);
sdois = cJSON_GetObjectItemCaseSensitive(fsaccess, "save_data_owner_ids");
if (cJSON_IsArray(sdois)) {
int idx = 0;
u64 *save_data_owner_id = (u64 *)((u8 *)fac + sizeof(FilesystemAccessControl));
cJSON_ArrayForEach(sdoi, sdois) {
if (!cJSON_GetU64FromObjectValue(sdoi, save_data_owner_id)) {
status = 0;
goto NPDM_BUILD_END;
}
++save_data_owner_id;
++idx;
}
fac->SdoiCount = idx;
}
acid->FacOffset = sizeof(NpdmAcid);
acid->FacSize = sizeof(FilesystemAccessControl);
acid->FacSize = sizeof(FilesystemAccessControl) + fac->CoiCount * 8 + fac->SdoiCount * 8;
acid->SacOffset = (acid->FacOffset + acid->FacSize + 0xF) & ~0xF;
/* Fah. */
FilesystemAccessHeader *fah = (FilesystemAccessHeader *)((u8 *)aci0 + sizeof(NpdmAci0));
fah->Version = 1;
fah->Perms = fac->Perms;
fah->_0xC = 0x1C;
fah->_0x14 = 0x1C;
fah->CoiOffset = sizeof(FilesystemAccessHeader);
fah->CoiSize = fac->CoiCount ? 4 + fac->CoiCount * 8 : 0;
fah->SdoiOffset = fah->CoiOffset + fah->CoiSize;
fah->SdoiSize = fac->SdoiCount ? 4 + fac->SdoiCount * 8 : 0;
if (fac->CoiCount) {
u32 *count = (u32 *)((u8 *)fah + fah->CoiOffset);
*count = fac->CoiCount;
u64 *id = (u64 *)((u8 *)count + sizeof(u32));
cJSON_ArrayForEach(coi, cois) {
if (!cJSON_GetU64FromObjectValue(coi, id)) {
status = 0;
goto NPDM_BUILD_END;
}
++id;
}
}
if (fac->SdoiCount) {
u32 *count = (u32 *)((u8 *)fah + fah->SdoiOffset);
*count = fac->SdoiCount;
u64 *id = (u64 *)((u8 *)count + sizeof(u32));
cJSON_ArrayForEach(sdoi, sdois) {
if (!cJSON_GetU64FromObjectValue(sdoi, id)) {
status = 0;
goto NPDM_BUILD_END;
}
++id;
}
}
aci0->FahOffset = sizeof(NpdmAci0);
aci0->FahSize = sizeof(FilesystemAccessHeader);
aci0->FahSize = sizeof(FilesystemAccessHeader) + fah->CoiSize + fah->SdoiSize;
aci0->SacOffset = (aci0->FahOffset + aci0->FahSize + 0xF) & ~0xF;
/* Sac. */
u8 *sac = (u8*)aci0 + aci0->SacOffset;
u32 sac_size = 0;