From 8d120ade61d34732dd388de48222b6803ee8eda8 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 3 Dec 2019 19:09:10 +0100 Subject: [PATCH] PhotoRec: recover SafeHouse virtual disk .sdsk files --- configure.ac | 2 +- src/Makefile.am | 1 + src/file_list.c | 2 ++ src/file_sdsk.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/file_sdsk.c diff --git a/configure.ac b/configure.ac index 40ee68dc..df758ccd 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([testdisk],[7.2-WIP],[grenier@cgsecurity.org]) AC_LANG(C) sinclude(acx_pthread.m4) sinclude(mkdir.m4) -TESTDISKDATE="November 2019" +TESTDISKDATE="December 2019" AC_SUBST(TESTDISKDATE) AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release]) AC_CONFIG_AUX_DIR(config) diff --git a/src/Makefile.am b/src/Makefile.am index a7c2a2b8..7151f244 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -285,6 +285,7 @@ file_C = filegen.c \ file_rw2.c \ file_rx2.c \ file_save.c \ + file_sdsk.c \ file_ses.c \ file_sgcta.c \ file_shn.c \ diff --git a/src/file_list.c b/src/file_list.c index f706680d..5e8867ee 100644 --- a/src/file_list.c +++ b/src/file_list.c @@ -288,6 +288,7 @@ extern const file_hint_t file_hint_rpm; extern const file_hint_t file_hint_rw2; extern const file_hint_t file_hint_rx2; extern const file_hint_t file_hint_save; +extern const file_hint_t file_hint_sdsk; extern const file_hint_t file_hint_ses; extern const file_hint_t file_hint_sgcta; extern const file_hint_t file_hint_shn; @@ -626,6 +627,7 @@ file_enable_t list_file_enable[]= { .enable=0, .file_hint=&file_hint_rw2 }, { .enable=0, .file_hint=&file_hint_rx2 }, { .enable=0, .file_hint=&file_hint_save }, + { .enable=0, .file_hint=&file_hint_sdsk }, { .enable=0, .file_hint=&file_hint_ses }, { .enable=0, .file_hint=&file_hint_sgcta }, { .enable=0, .file_hint=&file_hint_shn }, diff --git a/src/file_sdsk.c b/src/file_sdsk.c new file mode 100644 index 00000000..0d0ec6a5 --- /dev/null +++ b/src/file_sdsk.c @@ -0,0 +1,66 @@ +/* + + File: file_sdsk.c + + Copyright (C) 2019 Christophe GRENIER + + This software is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + */ + +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_STRING_H +#include +#endif +#include +#include "types.h" +#include "filegen.h" + +static void register_header_check_sdsk(file_stat_t *file_stat); + +const file_hint_t file_hint_sdsk= { + .extension="sdsk", + .description="SafeHouse virtual disk", + .max_filesize=PHOTOREC_MAX_FILE_SIZE, + .recover=1, + .enable_by_default=1, + .register_header_check=®ister_header_check_sdsk +}; + +static int header_check_sdsk(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->extension=file_hint_sdsk.extension; + file_recovery_new->min_filesize=0x1000; + return 1; +} + +static void register_header_check_sdsk(file_stat_t *file_stat) +{ + static const unsigned char sdsk_header[0x48]= { + 'W' , 'A' , 'R' , 'N' , 'I' , 'N' , 'G' , 0x3a, + ' ' , 'T' , 'h' , 'i' , 's' , ' ' , 'f' , 'i' , + 'l' , 'e' , ' ' , 'i' , 's' , ' ' , 'a' , ' ' , + 'S' , 'a' , 'f' , 'e' , 'H' , 'o' , 'u' , 's' , + 'e' , ' ' , 'v' , 'i' , 'r' , 't' , 'u' , 'a' , + 'l' , ' ' , 'd' , 'i' , 's' , 'k' , ' ' , 'v' , + 'o' , 'l' , 'u' , 'm' , 'e' , '.' , 0x0d, 0x0a, + 'h' , 'e' , 'a' , 'd' , 'e' , 'r' , ' ' , 'v' , + 'e' , 'r' , 's' , 'i' , 'o' , 'n' , 0x3a, ' ' , + }; + register_header_check(0, sdsk_header, sizeof(sdsk_header), &header_check_sdsk, file_stat); +}