From 5596b998590af33583de76c1b2c1ce63684f9fe3 Mon Sep 17 00:00:00 2001 From: Sorvigolova Date: Sun, 25 Mar 2018 21:49:16 +0400 Subject: [PATCH] Header parser fix 3 Another one --- Release/scetool.exe | Bin 258048 -> 258048 bytes src/sce.h | 4 ++-- src/self.cpp | 8 ++++---- src/tables.cpp | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Release/scetool.exe b/Release/scetool.exe index 1718d5448f00213a22ec1f6e9711d29f34db9447..bd9b4b225141a998424065d91ca90ba40fa5f342 100644 GIT binary patch delta 13931 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 XbLLZvB4>%S%(=s;jXvcy({}MceqIKv delta 13922 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 Z%+Fj;?>1-pG7B<`jb7?AUp4I#{{ts7=fMB~ diff --git a/src/sce.h b/src/sce.h index 7f0fbb1..f1a92b5 100644 --- a/src/sce.h +++ b/src/sce.h @@ -81,8 +81,8 @@ #define OPT_HEADER_TYPE_CAP_FLAGS 1 /*! Individuals seed header. */ #define OPT_HEADER_TYPE_INDIV_SEED 2 -/*! Optional header 4. */ -#define OPT_HEADER_TYPE_4 4 +/*! Control flags header 4. */ +#define OPT_HEADER_TYPE_CONTROL_FLAGS 4 /*! Metadata key/iv lengths. */ #define METADATA_INFO_KEYBITS 128 diff --git a/src/self.cpp b/src/self.cpp index 524c62f..a6096d4 100644 --- a/src/self.cpp +++ b/src/self.cpp @@ -317,7 +317,7 @@ void _print_opt_header(FILE *fp, opt_header_t *oh) else { u8 *h1 = (u8 *)oh + sizeof(opt_header_t); - _hexdump(fp, " Data", 0, h1, _ES32(oh->size) - sizeof(opt_header_t), FALSE); + _hexdump(fp, " Flags", 0, h1, _ES32(oh->size) - sizeof(opt_header_t), FALSE); } } break; @@ -327,10 +327,10 @@ void _print_opt_header(FILE *fp, opt_header_t *oh) _hexdump(fp, " Seed", 0, is, _ES32(oh->size) - sizeof(opt_header_t), FALSE); } break; - case OPT_HEADER_TYPE_4: + case OPT_HEADER_TYPE_CONTROL_FLAGS: { - u8 *h4 = (u8 *)oh + sizeof(opt_header_t); - _hexdump(fp, " Data", 0, h4, _ES32(oh->size) - sizeof(opt_header_t), FALSE); + u8 *ctrlf = (u8 *)oh + sizeof(opt_header_t); + _hexdump(fp, " Flags", 0, ctrlf, _ES32(oh->size) - sizeof(opt_header_t), FALSE); } break; } diff --git a/src/tables.cpp b/src/tables.cpp index 9c295eb..2d2854e 100644 --- a/src/tables.cpp +++ b/src/tables.cpp @@ -53,6 +53,7 @@ id_to_name_t _optional_header_types[] = { {OPT_HEADER_TYPE_CAP_FLAGS, "Capability Flags"}, {OPT_HEADER_TYPE_INDIV_SEED, "Individuals Seed"}, + {OPT_HEADER_TYPE_CONTROL_FLAGS, "Control Flags"}, {0, NULL} };