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

PhotoRec: stricter checl for .pfx

Browse source
This commit is contained in:
Christophe Grenier 2014-07-26 19:16:37 +02:00
parent ee3e137985
commit adb18ac16e
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/file_pfx.c
View file

@ -31,7 +31,6 @@
#include "filegen.h" #include "filegen.h"
static void register_header_check_pfx(file_stat_t *file_stat); static void register_header_check_pfx(file_stat_t *file_stat);
static int header_check_pfx(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);
const file_hint_t file_hint_pfx= { const file_hint_t file_hint_pfx= {
.extension="pfx", .extension="pfx",
@ -43,16 +42,6 @@ const file_hint_t file_hint_pfx= {
.register_header_check=&register_header_check_pfx .register_header_check=&register_header_check_pfx
}; };
static const unsigned char pfx_header[11]= {
0x06, 0x09,
0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01
};
static void register_header_check_pfx(file_stat_t *file_stat)
{
register_header_check(11, pfx_header,sizeof(pfx_header), &header_check_pfx, file_stat);
}
/* A pfx file are PKCS#12 data encoded following ASN.1 DER /* A pfx file are PKCS#12 data encoded following ASN.1 DER
* *
* PKCS #12: Personal Information Exchange Syntax Standard * PKCS #12: Personal Information Exchange Syntax Standard
@ -79,15 +68,26 @@ static int header_check_pfx(const unsigned char *buffer, const unsigned int buff
{ {
if(buffer[0]==0x30 && buffer[1]==0x82 && if(buffer[0]==0x30 && buffer[1]==0x82 &&
buffer[4]==0x02 && buffer[5]==0x01 && buffer[6]==0x03 && buffer[4]==0x02 && buffer[5]==0x01 && buffer[6]==0x03 &&
buffer[7]==0x30 && buffer[8]==0x82 && buffer[7]==0x30 && buffer[8]==0x82)
memcmp(&buffer[11], pfx_header, sizeof(pfx_header))==0)
{ {
const uint64_t size=((buffer[2])<<8) + buffer[3] + 4;
if(size < 11 + 11)
return 0;
reset_file_recovery(file_recovery_new); reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_pfx.extension; file_recovery_new->extension=file_hint_pfx.extension;
file_recovery_new->calculated_file_size=(((uint64_t)buffer[2])<<8) + (uint64_t)buffer[3] + 4; file_recovery_new->calculated_file_size=size;
file_recovery_new->data_check=&data_check_size; file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size; file_recovery_new->file_check=&file_check_size;
return 1; return 1;
} }
return 0; return 0;
} }
static void register_header_check_pfx(file_stat_t *file_stat)
{
static const unsigned char pfx_header[11]= {
0x06, 0x09,
0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01
};
register_header_check(11, pfx_header,sizeof(pfx_header), &header_check_pfx, file_stat);
}