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

+Wed May 23 15:30:32 CEST 2007 (tk)

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

+  * libclamav: DCONF support for NSIS

+

 Wed May 23 15:14:44 CEST 2007 (tk)

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

   * libclamav/nsis: make the code independent of external bzlib

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

     { "ARCHIVE",    "TAR",	    ARCH_CONF_TAR,	    1 },

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

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

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

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

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

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

 #define ARCH_CONF_TAR	    0x100

 #define ARCH_CONF_BINHEX    0x200

 #define ARCH_CONF_SIS	    0x400

+#define ARCH_CONF_NSIS	    0x800

 /* Document flags */

 #define DOC_CONF_HTML	    0x1

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

 			break;

 		    case CL_TYPE_NULSFT:

-		        if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE && fpt->offset > 4 /* FIXMENSIS && (DCONF_ARCH & ARCH_CONF_NSIS) */) {

+		        if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE && (DCONF_ARCH & ARCH_CONF_NSIS) && fpt->offset > 4) {

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

 			    nret = cli_scannulsft(desc, ctx, fpt->offset - 4);

 			}