luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'alexbrownbear-master'

Browse source
This commit is contained in:
Christophe Grenier 2018-04-30 14:07:38 +02:00
commit 45259e8a16
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/file_rar.c
View file

@ -32,11 +32,9 @@
static void register_header_check_rar(file_stat_t *file_stat);
static int header_check_rar(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new);
static void file_check_rar(file_recovery_t *file_recovery);
const file_hint_t file_hint_rar= {
.extension="rar", /* What is the correct extension ? */
.extension="rar",
.description="Rar archive",
.max_filesize=PHOTOREC_MAX_FILE_SIZE,
.recover=1,
@ -46,24 +44,42 @@ const file_hint_t file_hint_rar= {
#define MHD_PASSWORD 0x0080U
static void file_check_rar(file_recovery_t *file_recovery)
static void file_check_rar15fmt(file_recovery_t *file_recovery)
{
static const unsigned char rar_footer[7]={0xc4, 0x3d, 0x7b, 0x00, 0x40, 0x07, 0x00 };
file_search_footer(file_recovery, rar_footer, sizeof(rar_footer), 0);
static const unsigned char rar15fmt_footer[7]={0xc4, 0x3d, 0x7b, 0x00, 0x40, 0x07, 0x00 };
file_search_footer(file_recovery, rar15fmt_footer, sizeof(rar15fmt_footer), 0);
}
static int header_check_rar(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
static int header_check_rar15fmt(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
{
reset_file_recovery(file_recovery_new);
file_recovery_new->min_filesize=70;
if((buffer[0xa] & MHD_PASSWORD)==0)
file_recovery_new->file_check=&file_check_rar;
file_recovery_new->file_check=&file_check_rar15fmt;
file_recovery_new->extension=file_hint_rar.extension;
return 1;
}
static void file_check_rar50fmt(file_recovery_t *file_recovery)
{
static const unsigned char rar50fmt_footer[8]={0x1d, 0x77, 0x56, 0x51, 0x03, 0x05, 0x04, 0x00 };
file_search_footer(file_recovery, rar50fmt_footer, sizeof(rar50fmt_footer), 0);
}
static int header_check_rar50fmt(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
{
reset_file_recovery(file_recovery_new);
file_recovery_new->min_filesize=60;
if((buffer[0xa] & MHD_PASSWORD)==0)
file_recovery_new->file_check=&file_check_rar50fmt;
file_recovery_new->extension=file_hint_rar.extension;
return 1;
}
static void register_header_check_rar(file_stat_t *file_stat)
{
static const unsigned char rar_header[7]={0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 };
register_header_check(0, rar_header,sizeof(rar_header), &header_check_rar, file_stat);
static const unsigned char rar15fmt_header[7]={0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 };
static const unsigned char rar50fmt_header[8]={0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x01, 0x00 };
register_header_check(0, rar15fmt_header,sizeof(rar15fmt_header), &header_check_rar15fmt, file_stat);
register_header_check(0, rar50fmt_header,sizeof(rar50fmt_header), &header_check_rar50fmt, file_stat);
}