add ishield DCONF

libclamav/dconf.c

@@ -90,6 +90,7 @@ static struct dconf_module modules[] = {
     { "ARCHIVE",    "SIS",	    ARCH_CONF_SIS,	    1 },
     { "ARCHIVE",    "NSIS",	    ARCH_CONF_NSIS,	    1 },
     { "ARCHIVE",    "AUTOIT",	    ARCH_CONF_AUTOIT,	    1 },
+    { "ARCHIVE",    "ISHIELD",	    ARCH_CONF_ISHIELD,	    1 },
 
     { "DOCUMENT",   "HTML",	    DOC_CONF_HTML,	    1 },
     { "DOCUMENT",   "RTF",	    DOC_CONF_RTF,	    1 },

libclamav/dconf.h

@@ -75,6 +75,7 @@ struct cli_dconf {
 #define ARCH_CONF_ARJ       0x1000
 #define ARCH_CONF_AUTOIT    0x2000
 #define ARCH_CONF_CPIO	    0x4000
+#define ARCH_CONF_ISHIELD   0x8000
 
 /* Document flags */
 #define DOC_CONF_HTML		0x1

libclamav/scanners.c

@@ -1794,7 +1794,7 @@ static int cli_scanraw(int desc, cli_ctx *ctx, cli_file_t type, uint8_t typercg,
 			break;
 
 		    case CL_TYPE_ISHIELD_MSI:
-		        if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE /* FIXMEISHIELD && (DCONF_ARCH & ARCH_CONF_ISHIELD)*/) {
+		        if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE && (DCONF_ARCH & ARCH_CONF_ISHIELD)) {
 			    cli_dbgmsg("ISHIELD-MSI signature found at %u\n", (unsigned int) fpt->offset);
 			    nret = cli_scanishield_msi(desc, ctx, fpt->offset + 14);
 			}
@@ -1974,7 +1974,7 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)
 	    break;
 
         case CL_TYPE_ISHIELD_MSI:
-	    if(SCAN_ARCHIVE /* FIXMEISHIELD && (DCONF_ARCH & ARCH_CONF_ISHIELD)*/)
+	    if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_ISHIELD))
 		ret = cli_scanishield_msi(desc, ctx, 14);
 	    break;