@@ -1,3 +1,25 @@

+Thu Nov  3 22:42:28 CET 2011 (acab)

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

+ * libclamav/lzma_iface.c: stfu on (but still refuse) big lzma allocs

+

+Tue Nov  1 12:26:46 CET 2011 (acab)

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

+ * libclamav: Add 7z SFX support (b#3063)

+

+Thu Dec 15 21:40:57 CET 2011 (tk)

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

+ * libclamav/matcher-ac.c: improve negation of single elements - handle

+			   !(xx) (bb#4052)

+

+Thu Dec 15 18:34:03 EET 2011 (edwin)

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

+ * libclamav/pdf.c: scan inside encrypted PDF streams and strings when user

+		    password is empty (bb #2794).

+

+Fri Dec  9 16:41:05 CET 2011 (tk)

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

+ * libclamav/matcher.c: add new offset modifier SEx (bb#4008)

+

 Thu Dec  1 15:07:49 CET 2011 (tk)

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

  * libclamav/readdb.c: allow comments in all db files (bb#3930)

@@ -46,6 +46,7 @@ clamd_SOURCES = \

     others.h \

     shared.h \

     fan.c \

+    fan.h \

     fan-syscalllib.h

 AM_CFLAGS=@WERR_CFLAGS@

@@ -83,7 +83,7 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/misc.h clamd.c tcpserver.c tcpserver.h \

 	localserver.c localserver.h session.c session.h thrmgr.c \

 	thrmgr.h server-th.c server.h scanner.c scanner.h others.c \

-	others.h shared.h fan.c fan-syscalllib.h

+	others.h shared.h fan.c fan.h fan-syscalllib.h

 @BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	optparser.$(OBJEXT) getopt.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	misc.$(OBJEXT) clamd.$(OBJEXT) \

@@ -318,6 +318,7 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@    others.h \

 @BUILD_CLAMD_TRUE@    shared.h \

 @BUILD_CLAMD_TRUE@    fan.c \

+@BUILD_CLAMD_TRUE@    fan.h \

 @BUILD_CLAMD_TRUE@    fan-syscalllib.h

 @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@

@@ -16546,9 +16546,9 @@ $as_echo "$ac_cv_libbz2_libs" >&6; }

     test -z "$LIBBZ2_PREFIX" || LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";

     have_bzprefix="no"

-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzReadOpen in -lbz2" >&5

-$as_echo_n "checking for BZ2_bzReadOpen in -lbz2... " >&6; }

-if ${ac_cv_lib_bz2_BZ2_bzReadOpen+:} false; then :

+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzDecompressInit in -lbz2" >&5

+$as_echo_n "checking for BZ2_bzDecompressInit in -lbz2... " >&6; }

+if ${ac_cv_lib_bz2_BZ2_bzDecompressInit+:} false; then :

   $as_echo_n "(cached) " >&6

 else

   ac_check_lib_save_LIBS=$LIBS

@@ -16562,27 +16562,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 #ifdef __cplusplus

 extern "C"

 #endif

-char BZ2_bzReadOpen ();

+char BZ2_bzDecompressInit ();

 int

 main ()

 {

-return BZ2_bzReadOpen ();

+return BZ2_bzDecompressInit ();

   ;

   return 0;

 }

 _ACEOF

 if ac_fn_c_try_link "$LINENO"; then :

-  ac_cv_lib_bz2_BZ2_bzReadOpen=yes

+  ac_cv_lib_bz2_BZ2_bzDecompressInit=yes

 else

-  ac_cv_lib_bz2_BZ2_bzReadOpen=no

+  ac_cv_lib_bz2_BZ2_bzDecompressInit=no

 fi

 rm -f core conftest.err conftest.$ac_objext \

     conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzReadOpen" >&5

-$as_echo "$ac_cv_lib_bz2_BZ2_bzReadOpen" >&6; }

-if test "x$ac_cv_lib_bz2_BZ2_bzReadOpen" = xyes; then :

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzDecompressInit" >&5

+$as_echo "$ac_cv_lib_bz2_BZ2_bzDecompressInit" >&6; }

+if test "x$ac_cv_lib_bz2_BZ2_bzDecompressInit" = xyes; then :

   have_bzprefix="yes"

 fi

@@ -581,7 +581,7 @@ then

     test -z "$LIBBZ2_PREFIX" || LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";

     have_bzprefix="no"

-    AC_CHECK_LIB([bz2], [BZ2_bzReadOpen], [have_bzprefix="yes"])

+    AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [have_bzprefix="yes"])

     if test "x$have_bzprefix" = "xno"; then

         AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])

     fi

@@ -9,8 +9,12 @@

 #include <libkern/OSAtomic.h>

 #include <libkern/OSMalloc.h>

 #include <sys/sysctl.h>

+#include <sys/systm.h>

 #include <sys/kauth.h>

 #include <sys/vnode.h>

+#include <sys/uio.h>

+#include <sys/conf.h>

+#include <miscfs/devfs/devfs.h>

 #pragma mark ***** Global Resources

 /* These declarations are required to allocate memory and create locks.

@@ -776,6 +780,74 @@ SYSCTL_OID(

 static boolean_t gRegisteredOID = FALSE;

+

+/* /dev/clamauth handling */

+

+static int ca_devidx = -1;

+static void *ca_devnode = NULL;

+

+static int ca_open(dev_t dev, int flag, int devtype, proc_t p)

+{

+    return ENOENT;

+}

+

+static int ca_close(dev_t dev, int flag, int devtype, proc_t p)

+{

+    return ENOENT;

+}

+

+static int ca_read(dev_t dev, uio_t uio, int ioflag)

+{

+    return EBADF;

+}

+

+static int ca_write(dev_t dev, uio_t uio, int ioflag)

+{

+    return EBADF;

+}

+

+static int ca_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, proc_t p)

+{

+    return EBADF;

+}

+

+static int ca_select(dev_t dev, int flag, void * wql, proc_t p)

+{

+    return EBADF;

+}

+

+static struct cdevsw clamauth_cdevsw = {

+    ca_open,

+    ca_close,

+    ca_read,

+    ca_write,

+    ca_ioctl,

+    eno_stop,

+    eno_reset,

+    NULL,

+    ca_select,

+    eno_mmap,

+    eno_strat,

+    eno_getc,

+    eno_putc,

+    0

+};

+

+static int ca_remove(void)

+{

+    if(ca_devnode)

+        devfs_remove(ca_devnode);

+

+    if(ca_devidx != -1) {

+        if(cdevsw_remove(ca_devidx, &clamauth_cdevsw) != ca_devidx) {

+            printf("ClamAuth: cdevsw_remove() failed\n");

+            return KERN_FAILURE;

+        }

+    }

+

+    return KERN_SUCCESS;

+}

+

 #pragma mark ***** Start/Stop

 /* Prototypes for our entry points */

@@ -789,7 +861,18 @@ extern kern_return_t com_apple_dts_kext_ClamAuth_start(kmod_info_t * ki, void *

     #pragma unused(d)

     kern_return_t   err;

+    ca_devidx = cdevsw_add(-1, &clamauth_cdevsw);

+    if(ca_devidx == -1) {

+        printf("ClamAuth: cdevsw_add() failed\n");

+        return KERN_FAILURE;

+    }

+    ca_devnode = devfs_make_node(makedev(ca_devidx, 0), DEVFS_CHAR, UID_ROOT, GID_WHEEL, 0660, "clamauth");

+    if(!ca_devnode) {

+        printf("ClamAuth: Can't create /dev/clamauth\n");

+        return ca_remove();

+    }    

+    

     /* Allocate our global resources, needed in order to allocate memory 

      * and locks throughout the rest of the program.

      */

@@ -834,6 +917,7 @@ extern kern_return_t com_apple_dts_kext_ClamAuth_stop(kmod_info_t * ki, void * d

 {

     #pragma unused(ki)

     #pragma unused(d)

+    int ret;

     /* Remove our sysctl handler.  This prevents more threads entering the 

      * handler and trying to change the configuration.  There is still a 

@@ -850,6 +934,9 @@ extern kern_return_t com_apple_dts_kext_ClamAuth_stop(kmod_info_t * ki, void * d

         gRegisteredOID = FALSE;

     }

+    /* remove the character device */

+    ret = ca_remove();

+

     /* Shut down the scope listen, if any.  Not that we lock gConfigurationLock 

      * because RemoveListener requires it to be locked.  Further note that 

      * we only do this if the lock has actually been allocated.  If the startup 

@@ -880,5 +967,5 @@ extern kern_return_t com_apple_dts_kext_ClamAuth_stop(kmod_info_t * ki, void * d

     }

     printf("ClamAuth_stop: ClamAV kernel driver removed\n");

-    return KERN_SUCCESS;

+    return ret;

 }

@@ -78,6 +78,9 @@ Unpack a local CVD file (main or daily) to current directory.

 \fB\-\-diff=OLD NEW, \-d OLD NEW\fR

 Create a diff file for OLD and NEW CVDs/INCDIRs.

 .TP 

+\fB\-\-compare=OLD NEW, \-c OLD NEW\fR

+This command will compare two text files and print differences in a cdiff format.

+.TP 

 \fB\-\-run\-cdiff=FILE, \-r FILE\fR

 Execute update script FILE in current directory.

 .TP 

@@ -356,6 +356,8 @@ MalwareName:TargetType:Offset:HexSignature[:MinFL:[MaxFL]]

 	\item \verb#Sx+n# = start of section \verb+x+'s (counted from 0)

 	data plus \verb+n+ bytes

 	\item \verb#Sx-n# = start of section \verb+x+'s data minus \verb+n+ bytes

+	\item \verb#SEx# = entire section \verb+x+ (offset must lie within section

+	boundaries)

 	\item \verb#SL+n# = start of last section plus \verb+n+ bytes

 	\item \verb#SL-n# = start of last section minus \verb+n+ bytes

     \end{itemize}

deleted file mode 100644

@@ -1,138 +0,0 @@

-/*

- *  Copyright (C) 2009 Sourcefire, Inc.

- *

- *  Authors: aCaB

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-/* 7zip scanner */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include <stdio.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <fcntl.h>

-

-#include "others.h"

-#include "lzma_iface.h"

-#include "scanners.h"

-#include "matcher.h"

-#include "7z/7zFile.h"

-#include "7z/7zCrc.h"

-#include "7z/Archive/7z/7zIn.h"

-#include "7z/Archive/7z/7zExtract.h"

-

-static ISzAlloc allocImp = { __lzma_wrap_alloc, __lzma_wrap_free}, allocTempImp = { __lzma_wrap_alloc, __lzma_wrap_free};

-

-int cli_7unz (int fd, cli_ctx *ctx) {

-    CFileInStream archiveStream;

-    CLookToRead lookStream;

-    CSzArEx db;

-    UInt32 blockIndex = 0xFFFFFFFF;

-    unsigned char *buf = NULL;

-    size_t bufsz = 0;

-    UInt32 i;

-    int dupfd, ret = CL_CLEAN;

-    unsigned int fu=0;

-

-    if((dupfd = dup(fd)) == -1) {

-	cli_errmsg("cli_7unz: dup() failed\n");

-	return CL_EDUP;

-    }

-    FileInStream_CreateVTable(&archiveStream);

-    archiveStream.file.file = fdopen(dupfd, "rb");

-    if(!archiveStream.file.file) {

-	cli_errmsg("cli_7unz: fdopen() failed\n");

-	return CL_EOPEN;

-    }

-    LookToRead_CreateVTable(&lookStream, False);

-    lookStream.realStream = &archiveStream.s;

-    LookToRead_Init(&lookStream);

-

-    SzArEx_Init(&db);

-    if(SzArEx_Open(&db, &lookStream.s, &allocImp, &allocTempImp) != SZ_OK) {

-	SzArEx_Free(&db, &allocImp);

-	cli_dbgmsg("cli_7unz: possibly damaged archive\n");

-	fclose(archiveStream.file.file);

-	return CL_CLEAN;

-    }

-    for (i = 0; i < db.db.NumFiles; i++) {

-	CSzFileItem *f = db.db.Files + i;

-        size_t offset;

-        size_t usize;

-

-	if(f->IsDir || !f->Size) continue;

-	if(ctx->engine->maxfilesize && f->Size > ctx->engine->maxfilesize) {

-	    cli_dbgmsg("cli_7unz: skipping stream due to size limits (%llu vs %llu)\n", (long long)f->Size, (long long)ctx->engine->maxfilesize);

-	    continue;

-	}

-	if(cli_matchmeta(ctx, f->Name, 0, f->Size, 0, i + 1, 0, NULL) == CL_VIRUS) {

-	    ret = CL_VIRUS;

-	    break;

-	}

-	if (ctx->engine->maxfiles && fu>=ctx->engine->maxfiles) {

-	    cli_dbgmsg("cli_7unz: Files limit reached (max: %u)\n", ctx->engine->maxfiles);

-	    ret=CL_EMAXFILES;

-	    break;

-	}

-	cli_dbgmsg("cli_7unz: Extracting file %s\n", f->Name);

-	if(SzAr_Extract(&db, &lookStream.s, i, &blockIndex, &buf, &bufsz, &offset, &usize, &allocImp, &allocTempImp) == SZ_OK) {

-	    char *fname;

-	    int ofd;

-

-	    if(!usize) {

-		cli_dbgmsg("cli_7unz: stream uncompressed to an empty file\n");

-		continue;

-	    }

-	    fu++;

-	    if(!(fname = cli_gentemp(ctx->engine->tmpdir))) {

-		ret = CL_EMEM;

-		break;

-	    }

-	    if((ofd = open(fname, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRUSR|S_IWUSR)) < 0) {

-		cli_errmsg("cli_7unz: failed to create file %s\n", fname);

-		free(fname);

-		ret = CL_ECREAT;

-		break;

-	    }

-	    if(cli_writen(ofd, buf, usize) <= 0) {

-		close(ofd);

-		if(cli_unlink(fname)) ret = CL_EUNLINK;

-		else ret = CL_EWRITE;

-		free(fname);

-		break;

-	    }

-	    cli_dbgmsg("cli_7unz: extracted to %s\n", fname);

-	    lseek(ofd, 0, SEEK_SET);

-	    ret = cli_magic_scandesc(ofd, ctx);

-	    close(ofd);

-	    if(!ctx->engine->keeptmp)

-		if(cli_unlink(fname)) ret = CL_EUNLINK;

-	    free(fname);

-	    if(ret == CL_EUNLINK || ret == CL_VIRUS)

-		break;

-	} else {

-	    cli_dbgmsg("cli_7unz: decompression failed\n");

-	}

-    }

-    if(buf) free(buf);

-    SzArEx_Free(&db, &allocImp);

-    fclose(archiveStream.file.file);

-    return ret;

-}

deleted file mode 100644

@@ -1,32 +0,0 @@

-/*

- *  Copyright (C) 2009 Sourcefire, Inc.

- *

- *  Authors: aCaB

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#ifndef __7Z_H

-#define __7Z_H

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include "others.h"

-

-int cli_7unz (int, cli_ctx *);

-

-#endif

new file mode 100644

@@ -0,0 +1,203 @@

+/* 7z.h -- 7z interface

+2010-03-11 : Igor Pavlov : Public domain */

+

+#ifndef __7Z_H

+#define __7Z_H

+

+#include "7zBuf.h"

+

+EXTERN_C_BEGIN

+

+#define k7zStartHeaderSize 0x20

+#define k7zSignatureSize 6

+extern Byte k7zSignature[k7zSignatureSize];

+#define k7zMajorVersion 0

+

+enum EIdEnum

+{

+  k7zIdEnd,

+  k7zIdHeader,

+  k7zIdArchiveProperties,

+  k7zIdAdditionalStreamsInfo,

+  k7zIdMainStreamsInfo,

+  k7zIdFilesInfo,

+  k7zIdPackInfo,

+  k7zIdUnpackInfo,

+  k7zIdSubStreamsInfo,

+  k7zIdSize,

+  k7zIdCRC,

+  k7zIdFolder,

+  k7zIdCodersUnpackSize,

+  k7zIdNumUnpackStream,

+  k7zIdEmptyStream,

+  k7zIdEmptyFile,

+  k7zIdAnti,

+  k7zIdName,

+  k7zIdCTime,

+  k7zIdATime,

+  k7zIdMTime,

+  k7zIdWinAttributes,

+  k7zIdComment,

+  k7zIdEncodedHeader,

+  k7zIdStartPos,

+  k7zIdDummy

+};

+

+typedef struct

+{

+  UInt32 NumInStreams;

+  UInt32 NumOutStreams;

+  UInt64 MethodID;

+  CBuf Props;

+} CSzCoderInfo;

+

+void SzCoderInfo_Init(CSzCoderInfo *p);

+void SzCoderInfo_Free(CSzCoderInfo *p, ISzAlloc *alloc);

+

+typedef struct

+{

+  UInt32 InIndex;

+  UInt32 OutIndex;

+} CSzBindPair;

+

+typedef struct

+{

+  CSzCoderInfo *Coders;

+  CSzBindPair *BindPairs;

+  UInt32 *PackStreams;

+  UInt64 *UnpackSizes;

+  UInt32 NumCoders;

+  UInt32 NumBindPairs;

+  UInt32 NumPackStreams;

+  int UnpackCRCDefined;

+  UInt32 UnpackCRC;

+

+  UInt32 NumUnpackStreams;

+} CSzFolder;

+

+void SzFolder_Init(CSzFolder *p);

+UInt64 SzFolder_GetUnpackSize(CSzFolder *p);

+int SzFolder_FindBindPairForInStream(CSzFolder *p, UInt32 inStreamIndex);

+UInt32 SzFolder_GetNumOutStreams(CSzFolder *p);

+UInt64 SzFolder_GetUnpackSize(CSzFolder *p);

+

+SRes SzFolder_Decode(const CSzFolder *folder, const UInt64 *packSizes,

+    ILookInStream *stream, UInt64 startPos,

+    Byte *outBuffer, size_t outSize, ISzAlloc *allocMain);

+

+typedef struct

+{

+  UInt32 Low;

+  UInt32 High;

+} CNtfsFileTime;

+

+typedef struct

+{

+  CNtfsFileTime MTime;

+  UInt64 Size;

+  UInt32 Crc;

+  UInt32 Attrib;

+  Byte HasStream;

+  Byte IsDir;

+  Byte IsAnti;

+  Byte CrcDefined;

+  Byte MTimeDefined;

+  Byte AttribDefined;

+} CSzFileItem;

+

+void SzFile_Init(CSzFileItem *p);

+

+typedef struct

+{

+  UInt64 *PackSizes;

+  Byte *PackCRCsDefined;

+  UInt32 *PackCRCs;

+  CSzFolder *Folders;

+  CSzFileItem *Files;

+  UInt32 NumPackStreams;

+  UInt32 NumFolders;

+  UInt32 NumFiles;

+} CSzAr;

+

+void SzAr_Init(CSzAr *p);

+void SzAr_Free(CSzAr *p, ISzAlloc *alloc);

+

+

+/*

+  SzExtract extracts file from archive

+

+  *outBuffer must be 0 before first call for each new archive.

+

+  Extracting cache:

+    If you need to decompress more than one file, you can send

+    these values from previous call:

+      *blockIndex,

+      *outBuffer,

+      *outBufferSize

+    You can consider "*outBuffer" as cache of solid block. If your archive is solid,

+    it will increase decompression speed.

+  

+    If you use external function, you can declare these 3 cache variables

+    (blockIndex, outBuffer, outBufferSize) as static in that external function.

+    

+    Free *outBuffer and set *outBuffer to 0, if you want to flush cache.

+*/

+

+typedef struct

+{

+  CSzAr db;

+  

+  UInt64 startPosAfterHeader;

+  UInt64 dataPos;

+

+  UInt32 *FolderStartPackStreamIndex;

+  UInt64 *PackStreamStartPositions;

+  UInt32 *FolderStartFileIndex;

+  UInt32 *FileIndexToFolderIndexMap;

+

+  size_t *FileNameOffsets; /* in 2-byte steps */

+  CBuf FileNames;  /* UTF-16-LE */

+} CSzArEx;

+

+void SzArEx_Init(CSzArEx *p);

+void SzArEx_Free(CSzArEx *p, ISzAlloc *alloc);

+UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 indexInFolder);

+int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *resSize);

+

+/*

+if dest == NULL, the return value specifies the required size of the buffer,

+  in 16-bit characters, including the null-terminating character.

+if dest != NULL, the return value specifies the number of 16-bit characters that

+  are written to the dest, including the null-terminating character. */

+

+size_t SzArEx_GetFileNameUtf16(const CSzArEx *p, size_t fileIndex, UInt16 *dest);

+

+SRes SzArEx_Extract(

+    const CSzArEx *db,

+    ILookInStream *inStream,

+    UInt32 fileIndex,         /* index of file */

+    UInt32 *blockIndex,       /* index of solid block */

+    Byte **outBuffer,         /* pointer to pointer to output buffer (allocated with allocMain) */

+    size_t *outBufferSize,    /* buffer size for output buffer */

+    size_t *offset,           /* offset of stream for required file in *outBuffer */

+    size_t *outSizeProcessed, /* size of file in *outBuffer */

+    ISzAlloc *allocMain,

+    ISzAlloc *allocTemp);

+

+

+/*

+SzArEx_Open Errors:

+SZ_ERROR_NO_ARCHIVE

+SZ_ERROR_ARCHIVE

+SZ_ERROR_UNSUPPORTED

+SZ_ERROR_MEM

+SZ_ERROR_CRC

+SZ_ERROR_INPUT_EOF

+SZ_ERROR_FAIL

+*/

+

+SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream, ISzAlloc *allocMain, ISzAlloc *allocTemp);

+

+EXTERN_C_END

+

+#endif

new file mode 100644

@@ -0,0 +1,76 @@

+/* 7zAlloc.c -- Allocation functions

+2010-10-29 : Igor Pavlov : Public domain */

+

+#include "7zAlloc.h"

+

+/* #define _SZ_ALLOC_DEBUG */

+/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */

+

+#ifdef _SZ_ALLOC_DEBUG

+

+#ifdef _WIN32

+#include <windows.h>

+#endif

+

+#include <stdio.h>

+int g_allocCount = 0;

+int g_allocCountTemp = 0;

+

+#endif

+

+void *SzAlloc(void *p, size_t size)

+{

+  p = p;

+  if (size == 0)

+    return 0;

+  #ifdef _SZ_ALLOC_DEBUG

+  fprintf(stderr, "\nAlloc %10d bytes; count = %10d", size, g_allocCount);

+  g_allocCount++;

+  #endif

+  return malloc(size);

+}

+

+void SzFree(void *p, void *address)

+{

+  p = p;

+  #ifdef _SZ_ALLOC_DEBUG

+  if (address != 0)

+  {

+    g_allocCount--;

+    fprintf(stderr, "\nFree; count = %10d", g_allocCount);

+  }

+  #endif

+  free(address);

+}

+

+void *SzAllocTemp(void *p, size_t size)

+{

+  p = p;

+  if (size == 0)

+    return 0;

+  #ifdef _SZ_ALLOC_DEBUG

+  fprintf(stderr, "\nAlloc_temp %10d bytes;  count = %10d", size, g_allocCountTemp);

+  g_allocCountTemp++;

+  #ifdef _WIN32

+  return HeapAlloc(GetProcessHeap(), 0, size);

+  #endif

+  #endif

+  return malloc(size);

+}

+

+void SzFreeTemp(void *p, void *address)

+{

+  p = p;

+  #ifdef _SZ_ALLOC_DEBUG

+  if (address != 0)

+  {

+    g_allocCountTemp--;

+    fprintf(stderr, "\nFree_temp; count = %10d", g_allocCountTemp);

+  }

+  #ifdef _WIN32

+  HeapFree(GetProcessHeap(), 0, address);

+  return;

+  #endif

+  #endif

+  free(address);

+}

new file mode 100644

@@ -0,0 +1,15 @@

+/* 7zAlloc.h -- Allocation functions

+2010-10-29 : Igor Pavlov : Public domain */

+

+#ifndef __7Z_ALLOC_H

+#define __7Z_ALLOC_H

+

+#include <stdlib.h>

+

+void *SzAlloc(void *p, size_t size);

+void SzFree(void *p, void *address);

+

+void *SzAllocTemp(void *p, size_t size);

+void SzFreeTemp(void *p, void *address);

+

+#endif

@@ -1,11 +1,15 @@

 /* 7zBuf.h -- Byte Buffer

-2008-10-04 : Igor Pavlov : Public domain */

+2009-02-07 : Igor Pavlov : Public domain */

 #ifndef __7Z_BUF_H

 #define __7Z_BUF_H

 #include "Types.h"

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 typedef struct

 {

   Byte *data;

@@ -28,4 +32,8 @@ void DynBuf_SeekToBeg(CDynBuf *p);

 int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAlloc *alloc);

 void DynBuf_Free(CDynBuf *p, ISzAlloc *alloc);

+#ifdef __cplusplus

+}

+#endif

+

 #endif

new file mode 100644

@@ -0,0 +1,45 @@

+/* 7zBuf2.c -- Byte Buffer

+2008-10-04 : Igor Pavlov : Public domain */

+

+#include <string.h>

+#include "7zBuf.h"

+

+void DynBuf_Construct(CDynBuf *p)

+{

+  p->data = 0;

+  p->size = 0;

+  p->pos = 0;

+}

+

+void DynBuf_SeekToBeg(CDynBuf *p)

+{

+  p->pos = 0;

+}

+

+int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAlloc *alloc)

+{

+  if (size > p->size - p->pos)

+  {

+    size_t newSize = p->pos + size;

+    Byte *data;

+    newSize += newSize / 4;

+    data = (Byte *)alloc->Alloc(alloc, newSize);

+    if (data == 0)

+      return 0;

+    p->size = newSize;

+    memcpy(data, p->data, p->pos);

+    alloc->Free(alloc, p->data);

+    p->data = data;

+  }

+  memcpy(p->data + p->pos, buf, size);

+  p->pos += size;

+  return 1;

+}

+

+void DynBuf_Free(CDynBuf *p, ISzAlloc *alloc)

+{

+  alloc->Free(alloc, p->data);

+  p->data = 0;

+  p->size = 0;

+  p->pos = 0;

+}

@@ -1,24 +1,23 @@

 /* 7zCrc.c -- CRC32 calculation

-2008-08-05

-Igor Pavlov

-Public domain */

+2009-11-23 : Igor Pavlov : Public domain */

 #include "7zCrc.h"

+#include "CpuArch.h"

-#define kCrcPoly 0xEDB88320

-/* aCaB - Make the table a global const */

-const UInt32 g_CrcTable[256] = { 0, 0x77073096, 0xee0e612c, 0x990951ba, 0x76dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0xedb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x9b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x1db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x6b6b51f, 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0xf00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x86d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x3b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x4db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0xd6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0xa00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x26d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x5005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0xcb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0xbdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };

+const UInt32 g_CrcTable[256] = { 0x0, 0x77073096, 0xee0e612c, 0x990951ba, 0x76dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0xedb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x9b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x1db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x6b6b51f, 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0xf00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x86d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x3b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x4db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0xd6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0xa00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x26d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x5005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0xcb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0xbdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };