activate ELF code

git-svn: trunk@1711

clamav-devel/ChangeLog

@@ -1,3 +1,7 @@
+Mon Aug 29 17:00:36 CEST 2005 (tk)
+----------------------------------
+  * libclamav: activate ELF code
+
 Mon Aug 29 16:38:06 CEST 2005 (tk)
 ----------------------------------
   * libclamav/elf.c: detect file endianness and properly analyse executables on

clamav-devel/libclamav/Makefile.am

@@ -140,7 +140,9 @@ libclamav_la_SOURCES = \
 	pdf.c \
 	pdf.h \
 	spin.c \
-	spin.h
+	spin.h \
+	elf.c \
+	elf.h
 
 
 lib_LTLIBRARIES = libclamav.la

clamav-devel/libclamav/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32,8 +32,6 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-SOURCES = $(libclamav_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -88,7 +86,7 @@ am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \
 	chmunpack.lo rebuildpe.lo petite.lo fsg.lo line.lo untar.lo \
 	special.lo binhex.lo is_tar.lo tnef.lo unrar15.lo unrarvm.lo \
 	unrar.lo unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo \
-	pdf.lo spin.lo
+	pdf.lo spin.lo elf.lo
 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -336,7 +334,9 @@ libclamav_la_SOURCES = \
 	pdf.c \
 	pdf.h \
 	spin.c \
-	spin.h
+	spin.h \
+	elf.c \
+	elf.h
 
 lib_LTLIBRARIES = libclamav.la
 all: all-am
@@ -414,6 +414,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chmunpack.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filetypes.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlnorm.Plo@am__quote@

clamav-devel/libclamav/filetypes.c

@@ -50,7 +50,7 @@ static const struct cli_magic_s cli_magic[] = {
     /* Executables */
 
     {0,  "MZ",				2,  "DOS/W32 executable/library/driver", CL_TYPE_MSEXE},
-
+    {0,	 "\177ELF",			4,  "ELF",		CL_TYPE_ELF},
     /* Archives */
 
     {0,	    "Rar!",			4,  "RAR",		CL_TYPE_RAR},

clamav-devel/libclamav/filetypes.h

@@ -27,6 +27,7 @@ typedef enum {
     CL_TYPE_UNKNOWN_TEXT = CL_TYPENO,
     CL_TYPE_UNKNOWN_DATA,
     CL_TYPE_MSEXE,
+    CL_TYPE_ELF,
     CL_TYPE_DATA,
     CL_TYPE_POSIX_TAR,
     CL_TYPE_OLD_TAR,

clamav-devel/libclamav/scanners.c

@@ -1523,6 +1523,10 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const
 		ret = cli_scanpdf(desc, virname, scanned, root, limits, options, arec, mrec);
 	    break;
 
+	case CL_TYPE_ELF: /* TODO: Add ScanELF option */
+		ret = cli_scanelf(desc, virname, scanned, root, limits, options, arec, mrec);
+	    break;
+
 	case CL_TYPE_DATA:
 	    /* it could be a false positive and a standard DOS .COM file */
 	    {