summaryrefslogtreecommitdiffstats
path: root/src/file_iso.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2009-10-19 22:14:08 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2009-10-19 22:14:08 +0200
commit07c141de4d9ddd44f3bca65421057125ce365c51 (patch)
tree7ff7854a1381ea0eab56934206654d82e85e8db6 /src/file_iso.c
parent33e823ef654f4f79fb88599b7b8e09429f28afff (diff)
Identify ISO9660 image as non-partitionned media
Diffstat (limited to 'src/file_iso.c')
-rw-r--r--src/file_iso.c38
1 files changed, 1 insertions, 37 deletions
diff --git a/src/file_iso.c b/src/file_iso.c
index 6783f65..430419f 100644
--- a/src/file_iso.c
+++ b/src/file_iso.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include "types.h"
#include "filegen.h"
+#include "iso9660.h"
static void register_header_check_iso(file_stat_t *file_stat);
static int header_check_db(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);
@@ -50,43 +51,6 @@ static void register_header_check_iso(file_stat_t *file_stat)
register_header_check(0x8000, iso_header,sizeof(iso_header), &header_check_db, file_stat);
}
-struct iso_primary_descriptor
-{
- char type;
- char id[5];
- char version;
- char unused1;
- char system_id[32];
- char volume_id[32];
- char unused2[8];
- char volume_space_size[8];
- char unused3[32];
- char volume_set_size[4];
- char volume_sequence_number[4];
- char logical_block_size[4];
- char path_table_size[8];
- char type_l_path_tabl[4];
- char opt_type_l_path_table[4];
- char type_m_path_table[4];
- char opt_type_m_path_table[4];
- char root_directory_record[34];
- char volume_set_id[128];
- char publisher_id[128];
- char preparer_id[128];
- char application_id[128];
- char copyright_file_id[37];
- char abstract_file_id[37];
- char bibliographic_file_id[37];
- char creation_date[17];
- char modification_date[17];
- char expiration_date[17];
- char effective_date[17];
- char file_structure_version;
- char unused4;
- char application_data[512];
- char unused5[653];
-} __attribute__ ((__packed__));
-
static int header_check_db(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(buffer_size<0x8000+512) /* +2048 for the full mapping */