@@ -1,3 +1,7 @@

+Tue Oct 30 19:30:54 CET 2007 (tk)

+---------------------------------

+  * libclamav: add dconf support for autoit

+

 Tue Oct 30 19:01:41 CET 2007 (acab)

 -----------------------------------

   * libclamav: Add preliminary autoit unpacking support

@@ -80,6 +80,7 @@ static struct dconf_module modules[] = {

     { "ARCHIVE",    "BINHEX",	    ARCH_CONF_BINHEX,	    1 },

     { "ARCHIVE",    "SIS",	    ARCH_CONF_SIS,	    1 },

     { "ARCHIVE",    "NSIS",	    ARCH_CONF_NSIS,	    1 },

+    { "ARCHIVE",    "AUTOIT",	    ARCH_CONF_AUTOIT,	    1 },

     { "DOCUMENT",   "HTML",	    DOC_CONF_HTML,	    1 },

     { "DOCUMENT",   "RTF",	    DOC_CONF_RTF,	    1 },

@@ -66,6 +66,7 @@ struct cli_dconf {

 #define ARCH_CONF_SIS	    0x400

 #define ARCH_CONF_NSIS	    0x800

 #define ARCH_CONF_ARJ       0x1000

+#define ARCH_CONF_AUTOIT    0x2000

 /* Document flags */

 #define DOC_CONF_HTML	    0x1

@@ -65,7 +65,7 @@ typedef enum {

     CL_TYPE_CABSFX,

     CL_TYPE_ARJSFX,

     CL_TYPE_NULSFT, /* on the fly */

-    CL_TYPE_AUTOIT /* FIXME_AUTOIT: Tomasz, good nuff? */

+    CL_TYPE_AUTOIT

 } cli_file_t;

 struct cli_matched_type {

@@ -1929,7 +1929,7 @@ static int cli_scanraw(int desc, cli_ctx *ctx, cli_file_t type, uint8_t typercg)

 			break;

 		    case CL_TYPE_AUTOIT:

-		        if(1 && type == CL_TYPE_MSEXE /* FIXME_AUTOIT: Tomasz, pls DCONF THIS */) {

+		        if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE && (DCONF_ARCH & ARCH_CONF_AUTOIT)) {

 			    cli_dbgmsg("AUTOIT signature found at %u\n", (unsigned int) fpt->offset);

 			    nret = cli_scanautoit(desc, ctx, fpt->offset + 23);

 			}