@@ -106,6 +106,10 @@ int main(int argc, char **argv)

 	cl_debug(); /* enable debug messages */

     }

+    if (optget(opts, "gen-mdb")->enabled) {

+        cl_always_gen_section_hash();

+    }

+

     if(optget(opts, "version")->enabled) {

 	print_version(optget(opts, "database")->strarg);

 	optfree(opts);

@@ -41,6 +41,7 @@ CLAMAV_PUBLIC {

     cl_fmap_open_memory;

     cl_scanmap_callback;

     cl_fmap_close;

+    cl_always_gen_section_hash;

 };

 CLAMAV_PRIVATE {

   global:

@@ -187,6 +187,11 @@ void cl_debug(void)

     cli_debug_flag = 1;

 }

+void cl_always_gen_section_hash(void)

+{

+    cli_always_gen_section_hash = 1;

+}

+

 unsigned int cl_retflevel(void)

 {

     return CL_FLEVEL;

@@ -60,6 +60,7 @@

 #define CL_FLEVEL_SIGTOOL CL_FLEVEL

 extern uint8_t cli_debug_flag;

+extern uint8_t cli_always_gen_section_hash;

 /*

  * CLI_ISCONTAINED(buf1, size1, buf2, size2) checks if buf2 is contained

@@ -119,6 +119,7 @@ void cli_logg_unsetup(void)

 }

 #endif

 uint8_t cli_debug_flag = 0;

+uint8_t cli_always_gen_section_hash = 0;

 static void fputs_callback(enum cl_msg severity, const char *fullmsg, const char *msg, void *context)

 {

@@ -556,12 +556,39 @@ static int scan_pe_mdb (cli_ctx * ctx, struct cli_exe_section *exe_section)

     /* Print hash */

     if (cli_debug_flag) {

         md5 = hashset[CLI_HASH_MD5];

-        if (md5)

+        if (md5) {

             cli_dbgmsg("MDB: %u:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",

                 exe_section->rsz, md5[0], md5[1], md5[2], md5[3], md5[4], md5[5], md5[6], md5[7],

                 md5[8], md5[9], md5[10], md5[11], md5[12], md5[13], md5[14], md5[15]);

-        else

+        } else if (cli_always_gen_section_hash) {

+            const void *hashme = fmap_need_off_once(*ctx->fmap, exe_section->raw, exe_section->rsz);

+            cli_md5_ctx md5ctx;

+            if (!(hashme)) {

+                cli_errmsg("scan_pe_mdb: unable to read section data\n");

+                ret = CL_EREAD;

+                goto end;

+            }

+

+            md5 = cli_malloc(16);

+            if (!(md5)) {

+                cli_errmsg("scan_pe_mdb: cli_malloc failed!\n");

+                ret = CL_EMEM;

+                goto end;

+            }

+

+            cli_md5_init(&md5ctx);

+            cli_md5_update(&md5ctx, hashme, exe_section->rsz);

+            cli_md5_final(md5, &md5ctx);

+

+            cli_dbgmsg("MDB: %u:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",

+                exe_section->rsz, md5[0], md5[1], md5[2], md5[3], md5[4], md5[5], md5[6], md5[7],

+                md5[8], md5[9], md5[10], md5[11], md5[12], md5[13], md5[14], md5[15]);

+

+            free(md5);

+

+        } else {

             cli_dbgmsg("MDB: %u:notgenerated\n", exe_section->rsz);

+        }

     }

     /* Do scans */

@@ -582,6 +609,7 @@ static int scan_pe_mdb (cli_ctx * ctx, struct cli_exe_section *exe_section)

        }

     }

+end:

     for(type = CLI_HASH_AVAIL_TYPES; type > 0;)

         free(hashset[--type]);

     return ret;

@@ -86,6 +86,7 @@ const struct clam_option __clam_options[] = {

     { NULL, "allmatch", 'z', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN | OPT_CLAMDSCAN, "", "" },

     { NULL, "database", 'd', TYPE_STRING, NULL, -1, DATADIR, FLAG_REQUIRED | FLAG_MULTIPLE, OPT_CLAMSCAN, "", "" }, /* merge it with DatabaseDirectory (and fix conflict with --datadir */

     { NULL, "recursive", 'r', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "", "" },

+    { NULL, "gen-mdb", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "Always generate MDB entries for PE sections", "" },

     { NULL, "follow-dir-symlinks", 0, TYPE_NUMBER, MATCH_NUMBER, 1, NULL, 0, OPT_CLAMSCAN, "", "" },

     { NULL, "follow-file-symlinks", 0, TYPE_NUMBER, MATCH_NUMBER, 1, NULL, 0, OPT_CLAMSCAN, "", "" },

     { NULL, "bell", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "", "" },

@@ -41,6 +41,7 @@ EXPORTS cl_set_clcb_msg @33

 EXPORTS cl_engine_set_clcb_hash @34

 EXPORTS cl_engine_set_clcb_pre_cache @35

 EXPORTS cl_engine_set_clcb_meta @36

+EXPORTS cl_always_gen_section_hash @37

 ; path variables

@@ -165,6 +165,15 @@

     <ResourceCompile Include="res\libclamav.rc" />

   </ItemGroup>

   <ItemGroup>

+    <ClCompile Include="..\libclamav\7z\7zCrcOpt.c" />

+    <ClCompile Include="..\libclamav\7z\BraIA64.c" />

+    <ClCompile Include="..\libclamav\7z\CpuArch.c" />

+    <ClCompile Include="..\libclamav\7z\Delta.c" />

+    <ClCompile Include="..\libclamav\7z\Sha256.c" />

+    <ClCompile Include="..\libclamav\7z\Xz.c" />

+    <ClCompile Include="..\libclamav\7z\XzCrc64.c" />

+    <ClCompile Include="..\libclamav\7z\XzDec.c" />

+    <ClCompile Include="..\libclamav\7z\XzIn.c" />

     <ClCompile Include="..\libclamav\sf_base64decode.c" />

     <ClCompile Include="..\libclamav\tomsfastmath\mul\fp_mul_comba_small_set.c" />

     <ClCompile Include="..\libclamav\tomsfastmath\mul\fp_mul_comba_9.c" />

@@ -376,6 +385,7 @@

     <ClCompile Include="..\libclamav\version.c" />

     <ClCompile Include="..\libclamav\wwunpack.c" />

     <ClCompile Include="..\libclamav\xar.c" />

+    <ClCompile Include="..\libclamav\xz_iface.c" />

     <ClCompile Include="..\libclamav\yc.c" />

     <ClCompile Include="..\shared\getopt.c" />

     <ClCompile Include="..\shared\misc.c" />

@@ -471,4 +481,4 @@

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>

+</Project>

\ No newline at end of file

@@ -843,5 +843,35 @@

     <ClCompile Include="3rdparty\libxml2\xmlstring.c">

       <Filter>Source Files\libxml2</Filter>

     </ClCompile>

+    <ClCompile Include="..\libclamav\xz_iface.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\7zCrcOpt.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\BraIA64.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\CpuArch.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\Delta.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\Sha256.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\Xz.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\XzCrc64.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\XzDec.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libclamav\7z\XzIn.c">

+      <Filter>Source Files\7z</Filter>

+    </ClCompile>

   </ItemGroup>

-</Project>

+</Project>

\ No newline at end of file