Compare commits

...

1 Commits

Author SHA1 Message Date
coah
2c9c357988 cleanup(CDBCryptBuf): rename unk_0x3EC00/04 to size/offset
Decrypt fills size; Matching CDBRecordFile uses offset for seek/tell/read.
2026-10-02 13:58:16 -05:00
3 changed files with 15 additions and 15 deletions

View File

@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
u32 buffer32[0xFB00]; u32 buffer32[0xFB00];
}; // 0x00 }; // 0x00
u32 unk_0x3EC00; u32 size; // 0x3EC00
u32 unk_0x3EC04; u32 offset; // 0x3EC04
BOOL allocated; // 0x3EC08 BOOL allocated; // 0x3EC08
u8 unk_0x3EC0C[0x34]; u8 unk_0x3EC0C[0x34];
} CDBCryptBuf; } CDBCryptBuf;

View File

@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
goto open_result_ready; goto open_result_ready;
open_location_ok: open_location_ok:
if (CDBFSSDIsMounted()) { if (CDBFSSDIsMounted()) {
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL); err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
} else { } else {
err = CDB_ERROR_SD_IS_NOT_MOUNTED; err = CDB_ERROR_SD_IS_NOT_MOUNTED;
} }
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf); CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return err; return err;
} }
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf); cryptBuf->offset = sizeof(CDBAttrBuf);
} }
return CDB_ERROR_OK; return CDB_ERROR_OK;
} }
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
goto result_ready; goto result_ready;
location_ok: location_ok:
if (CDBFSSDIsMounted()) { if (CDBFSSDIsMounted()) {
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL); result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
} else { } else {
result = CDB_ERROR_SD_IS_NOT_MOUNTED; result = CDB_ERROR_SD_IS_NOT_MOUNTED;
} }
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf); CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return result; return result;
} }
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf); cryptBuf->offset = sizeof(CDBAttrBuf);
} }
return CDB_ERROR_OK; return CDB_ERROR_OK;
} }

View File

@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
CDBCryptBuf* cryptBuf = record->cryptBuf; CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) { if (cryptBuf != NULL) {
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04; u32 unk = cryptBuf->size - cryptBuf->offset;
if (cryptBuf->unk_0x3EC00 < unk) { if (cryptBuf->size < unk) {
unk = 0; unk = 0;
} }
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
} }
if (unk != 0) { if (unk != 0) {
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk); memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
cryptBuf->unk_0x3EC04 += unk; cryptBuf->offset += unk;
} }
if (readSize != NULL) { if (readSize != NULL) {
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
if (cryptBuf != NULL) { if (cryptBuf != NULL) {
switch (seek) { switch (seek) {
case CDB_SEEK_BEGIN: { case CDB_SEEK_BEGIN: {
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf); cryptBuf->offset = sizeof(CDBAttrBuf);
cryptBuf->unk_0x3EC04 += offset; cryptBuf->offset += offset;
break; break;
} }
case CDB_SEEK_END: { case CDB_SEEK_END: {
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset; cryptBuf->offset = (cryptBuf->size - 1) - offset;
break; break;
} }
case CDB_SEEK_CUR: { case CDB_SEEK_CUR: {
cryptBuf->unk_0x3EC04 += offset; cryptBuf->offset += offset;
break; break;
} }
} }
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
CDBCryptBuf* cryptBuf = record->cryptBuf; CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) { if (cryptBuf != NULL) {
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf); return cryptBuf->offset - sizeof(CDBAttrBuf);
} }
return CDBFTellData(&recordFile->bridgeFile, record->key.location); return CDBFTellData(&recordFile->bridgeFile, record->key.location);
} }