[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 d11228db8f56e8ab09a1cf11d7bebc9a76874198
Merge: 1b98609f174599416552dd4cf322c8e8e813c973 435aabebc8da654cb2a697e1723d91b670c73059
Author: aCaB <acab at clamav.net>
Date:   Tue Jul 14 23:44:03 2009 +0200

    merge preliminary IS support

diff --combined ChangeLog
index 2bb7156,b3744bb..5b6bcc1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,26 +1,31 @@@
++Tue Jul 14 23:41:37 CEST 2009 (acab)
++------------------------------------
++ * libclamav: add preliminary support for IS executables (IS-cab and IS-msi)
++		part of bb#1571
++
+ Tue Jul 14 18:17:59 CEST 2009 (tk)
+ ----------------------------------
+  * libclamav: add support for Universal Binaries (archives with Mach-O files for
+ 	      different architectures, bb#1592)
+ 
+ Mon Jul 13 21:40:51 CEST 2009 (tk)
+ ----------------------------------
+  * docs/signatures.pdf: cover Mach-O files
+ 
+ Mon Jul 13 21:24:05 CEST 2009 (tk)
+ ----------------------------------
+  * libclamav: handle Mach-O files with type-9 signatures; all special offsets are
+ 	      supported for PPC32/64 and x86 executables; for ARM and other archs
+ 	      only section based extensions (Sx[+-]n, SL[+-]n) are supported atm
+ 
+ Mon Jul 13 19:34:36 EEST 2009 (edwin)
+ -------------------------------------
+  * clambc/, libclamav/, unit_tests/: Initial draft of bytecode interpreter (bb #1243).
+ 
+ Mon Jul 13 16:06:31 CEST 2009 (tk)
+ ----------------------------------
+  * libclamav/macho.c: handle LC_THREAD; calculate EP
+ 
  Fri Jul 10 10:10:35 CEST 2009 (tk)
  ----------------------------------
   * libclamav/filetypes_int.h: sync with daily.ftm
diff --combined libclamav/filetypes.c
index 3005769,0cbc096..6746abf
--- a/libclamav/filetypes.c
+++ b/libclamav/filetypes.c
@@@ -57,6 -57,7 +57,7 @@@ static const struct ftmap_s 
      { "CL_TYPE_MSEXE",		CL_TYPE_MSEXE		},
      { "CL_TYPE_ELF",		CL_TYPE_ELF		},
      { "CL_TYPE_MACHO",		CL_TYPE_MACHO		},
+     { "CL_TYPE_MACHO_UNIBIN",	CL_TYPE_MACHO_UNIBIN	},
      { "CL_TYPE_POSIX_TAR",	CL_TYPE_POSIX_TAR	},
      { "CL_TYPE_OLD_TAR",	CL_TYPE_OLD_TAR		},
      { "CL_TYPE_CPIO_OLD",	CL_TYPE_CPIO_OLD	},
@@@ -93,7 -94,6 +94,7 @@@
      { "CL_TYPE_ARJSFX",		CL_TYPE_ARJSFX		},
      { "CL_TYPE_NULSFT",		CL_TYPE_NULSFT		},
      { "CL_TYPE_AUTOIT",		CL_TYPE_AUTOIT		},
 +    { "CL_TYPE_ISHIELD_MSI",	CL_TYPE_ISHIELD_MSI	},
      { NULL,			CL_TYPE_IGNORED		}
  };
  
diff --combined libclamav/filetypes.h
index cd31d26,da6433d..dbb63a1
--- a/libclamav/filetypes.h
+++ b/libclamav/filetypes.h
@@@ -42,6 -42,7 +42,7 @@@ typedef enum 
      CL_TYPE_PE_DISASM,
      CL_TYPE_ELF,
      CL_TYPE_MACHO,
+     CL_TYPE_MACHO_UNIBIN,
      CL_TYPE_POSIX_TAR,
      CL_TYPE_OLD_TAR,
      CL_TYPE_CPIO_OLD,
@@@ -80,7 -81,6 +81,7 @@@
      CL_TYPE_ARJSFX,
      CL_TYPE_NULSFT, /* on the fly */
      CL_TYPE_AUTOIT,
 +    CL_TYPE_ISHIELD_MSI,
      CL_TYPE_IGNORED /* please don't add anything below */
  } cli_file_t;
  
diff --combined libclamav/filetypes_int.h
index 8636b69,1e1f1fa..b38c224
--- a/libclamav/filetypes_int.h
+++ b/libclamav/filetypes_int.h
@@@ -148,7 -148,7 +148,8 @@@ static const char *ftypes_int[] = 
    "0:0:cffaedfe:Mach-O LE 64-bit:CL_TYPE_ANY:CL_TYPE_MACHO:45",
    "0:0:feedface:Mach-O BE:CL_TYPE_ANY:CL_TYPE_MACHO:45",
    "0:0:feedfacf:Mach-O BE 64-bit:CL_TYPE_ANY:CL_TYPE_MACHO:45",
 +  "1:*:496e7374616c6c536869656c6400{292}0600000000000000{8}0000000001:ISHIELD-MSI:CL_TYPE_ANY:CL_TYPE_ISHIELD_MSI:45",
+   "0:0:cafebabe:Universal Binary:CL_TYPE_ANY:CL_TYPE_MACHO_UNIBIN:46",
    NULL
  };
  
diff --combined libclamav/scanners.c
index ab8e3ab,22985cd..995ffee
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@@ -94,7 -94,6 +94,7 @@@
  #include "default.h"
  #include "cpio.h"
  #include "macho.h"
 +#include "ishield.h"
  
  #ifdef HAVE_BZLIB_H
  #include <bzlib.h>
@@@ -1793,13 -1792,6 +1793,13 @@@ static int cli_scanraw(int desc, cli_ct
  			}
  			break;
  
 +		    case CL_TYPE_ISHIELD_MSI:
 +		        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);
 +			}
 +			break;
 +
  		    case CL_TYPE_PDF:
  			if(type != CL_TYPE_PDF && SCAN_PDF && (DCONF_DOC & DOC_CONF_PDF)) {
  			    cli_dbgmsg("PDF signature found at %u\n", (unsigned int) fpt->offset);
@@@ -2095,7 -2087,12 +2095,12 @@@ int cli_magic_scandesc(int desc, cli_ct
  
  	case CL_TYPE_MACHO:
  	    if(ctx->dconf->macho)
- 		ret = cli_scanmacho(desc, ctx);
+ 		ret = cli_scanmacho(desc, ctx, NULL);
+ 	    break;
+ 
+ 	case CL_TYPE_MACHO_UNIBIN:
+ 	    if(ctx->dconf->macho)
+ 		ret = cli_scanmacho_unibin(desc, ctx);
  	    break;
  
  	case CL_TYPE_SIS:

-- 
Debian repository for ClamAV