PhotoRec: recover Dalvik .dex files

3 files changed, 68 insertions, 0 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e3da0e..f0b64f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,6 +66,7 @@ file_C			= filegen.c \
 			  file_dat.c \
 			  file_dbf.c \
 			  file_dbn.c \
+			  file_dex.c \
 			  file_dim.c \
 			  file_dir.c \
 			  file_djv.c \
diff --git a/src/file_dex.c b/src/file_dex.c
new file mode 100644
index 0000000..1b0787c
--- a/dev/null
+++ b/src/file_dex.c
@@ -0,0 +1,65 @@
+/*
+
+    File: file_dex.c
+
+    Copyright (C) 2010 Christophe GRENIER <grenier@cgsecurity.org>
+  
+    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 <config.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <stdio.h>
+#include "types.h"
+#include "filegen.h"
+
+static void register_header_check_dex(file_stat_t *file_stat);
+static int header_check_dex(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_dex= {
+  .extension="dex",
+  .description="Dalvik",
+  .min_header_distance=0,
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_dex
+};
+
+static const unsigned char dex_header[5]= {'d','e','x','\n','0'};
+
+static void register_header_check_dex(file_stat_t *file_stat)
+{
+  register_header_check(0, dex_header,sizeof(dex_header), &header_check_dex, file_stat);
+}
+
+static int header_check_dex(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)
+{
+  if(memcmp(buffer, dex_header, sizeof(dex_header))==0 && buffer[7]==0x00)
+  {
+    reset_file_recovery(file_recovery_new);
+    file_recovery_new->extension=file_hint_dex.extension;
+    file_recovery_new->calculated_file_size=(uint64_t)buffer[0x20]+(((uint64_t)buffer[0x21])<<8)+(((uint64_t)buffer[0x22])<<16)+(((uint64_t)buffer[0x23])<<24);
+    file_recovery_new->data_check=&data_check_size;
+    file_recovery_new->file_check=&file_check_size;
+    return 1;
+  }
+  return 0;
+}
diff --git a/src/file_list.c b/src/file_list.c
index 0b138d5..4f01b40 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -68,6 +68,7 @@ extern const file_hint_t file_hint_d2s;
 extern const file_hint_t file_hint_dat;
 extern const file_hint_t file_hint_dbf;
 extern const file_hint_t file_hint_dbn;
+extern const file_hint_t file_hint_dex;
 extern const file_hint_t file_hint_dim;
 extern const file_hint_t file_hint_dir;
 extern const file_hint_t file_hint_djv;
@@ -272,6 +273,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_dat  },
   { .enable=0, .file_hint=&file_hint_dbf  },
   { .enable=0, .file_hint=&file_hint_dbn  },
+  { .enable=0, .file_hint=&file_hint_dex  },
   { .enable=0, .file_hint=&file_hint_dim  },
   { .enable=0, .file_hint=&file_hint_dir  },
   { .enable=0, .file_hint=&file_hint_djv  },