[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 59098a112e0c0df19eeda50fcc7ac708c534085d
Author: aCaB <acab at clamav.net>
Date:   Mon Feb 8 13:47:20 2010 +0100

    drop type-8 sigs (bb#895)

diff --git a/ChangeLog b/ChangeLog
index cf60bb9..2a1575c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb  8 13:40:06 CET 2010 (acab)
+----------------------------------
+ * libclamav: drop support for type 8 signatures. disasm matching is now
+		done via bytecode
+
 Mon Feb  8 10:30:03 CET 2010 (tk)
 ---------------------------------
  * freshclam, sigtool: use zlib's Z_FILTERED strategy
diff --git a/libclamav/filetypes.h b/libclamav/filetypes.h
index bd1934b..0ed8ad4 100644
--- a/libclamav/filetypes.h
+++ b/libclamav/filetypes.h
@@ -41,7 +41,6 @@ typedef enum {
     /* Please do not add any new types above this line */
     CL_TYPE_ERROR,
     CL_TYPE_MSEXE,
-    CL_TYPE_PE_DISASM,
     CL_TYPE_ELF,
     CL_TYPE_MACHO,
     CL_TYPE_MACHO_UNIBIN,
diff --git a/libclamav/matcher.h b/libclamav/matcher.h
index 36dda3f..b90d84b 100644
--- a/libclamav/matcher.h
+++ b/libclamav/matcher.h
@@ -136,7 +136,7 @@ static const struct cli_mtarget cli_mtargets[CLI_MTARGETS] =  {
     { CL_TYPE_GRAPHICS,	    "GRAPHICS",	    5,	1   },
     { CL_TYPE_ELF,	    "ELF",	    6,	1   },
     { CL_TYPE_TEXT_ASCII,   "ASCII",	    7,	1   },
-    { CL_TYPE_PE_DISASM,    "DISASM",	    8,	1   },
+    { CL_TYPE_ERROR,        "NOT USED",	    8,	1   },
     { CL_TYPE_MACHO,	    "MACH-O",	    9,	1   }
 };
 
diff --git a/libclamav/pe.c b/libclamav/pe.c
index 7db50f5..0ac5b84 100644
--- a/libclamav/pe.c
+++ b/libclamav/pe.c
@@ -1074,16 +1074,19 @@ int cli_scanpe(cli_ctx *ctx, icon_groupset *iconset)
 
     epsize = fmap_readn(map, epbuff, ep, 4096);
 
-    CLI_UNPTEMP("DISASM",(exe_sections,0));
-    if(disasmbuf((unsigned char*)epbuff, epsize, ndesc))
-	ret = cli_scandesc(ndesc, ctx, CL_TYPE_PE_DISASM, 1, NULL, AC_SCAN_VIR);
-    close(ndesc);
-    CLI_TMPUNLK();
-    free(tempfile);
-    if(ret == CL_VIRUS) {
-	free(exe_sections);
-	return ret;
-    }
+
+    /* Disasm scan disabled since it's now handled by the bytecode */
+
+    /* CLI_UNPTEMP("DISASM",(exe_sections,0)); */
+    /* if(disasmbuf((unsigned char*)epbuff, epsize, ndesc)) */
+    /* 	ret = cli_scandesc(ndesc, ctx, CL_TYPE_PE_DISASM, 1, NULL, AC_SCAN_VIR); */
+    /* close(ndesc); */
+    /* CLI_TMPUNLK(); */
+    /* free(tempfile); */
+    /* if(ret == CL_VIRUS) { */
+    /* 	free(exe_sections); */
+    /* 	return ret; */
+    /* } */
 
     if(overlays) {
 	int overlays_sz = fsize - overlays;

-- 
Debian repository for ClamAV