@@ -1,3 +1,7 @@

+Sat Feb  3 02:00:44 CET 2007 (tk)

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

+  * libclamav: s/CL_SCAN_ALGO/CL_SCAN_ALGORITHMIC/g

+

 Fri Feb  2 23:38:12 CET 2007 (tk)

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

   * configure/make: minor cleanup and fix for bb#260

@@ -76,7 +76,7 @@ Detailed list of changes (to be finished):

   + Support for Sensory Networks' NodalCore hardware acceleration technology

   + Advanced phishing detection module (experimental)

   + Signatures are stored in separate trees depending on their target type

-  + Algorithmic detection can be controlled with CL_SCAN_ALGO

+  + Algorithmic detection can be controlled with CL_SCAN_ALGORITHMIC

   + Support for new obfuscators: SUE, Y0da Cryptor, CryptFF

   + Support for new packers: NsPack, wwpack32, MEW, Upack

   + Support for SIS files (SymbianOS packages)

@@ -357,7 +357,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

     if(cfgopt(copt, "AlgorithmicDetection")->enabled) {

 	logg("Algorithmic detection enabled.\n");

-	options |= CL_SCAN_ALGO;

+	options |= CL_SCAN_ALGORITHMIC;

     } else {

 	logg("Algorithmic detection disabled.\n");

     }

@@ -284,9 +284,9 @@ int scanmanager(const struct optstruct *opt)

     }

     if(opt_check(opt, "no-algorithmic"))

-	options &= ~CL_SCAN_ALGO;

+	options &= ~CL_SCAN_ALGORITHMIC;

     else

-	options |= CL_SCAN_ALGO;

+	options |= CL_SCAN_ALGORITHMIC;

 #ifdef C_LINUX

     procdev = (dev_t) 0;

@@ -89,14 +89,14 @@ extern "C"

 #define CL_SCAN_BLOCKBROKEN	    0x40

 #define CL_SCAN_MAILURL		    0x80

 #define CL_SCAN_BLOCKMAX	    0x100

-#define CL_SCAN_ALGO		    0x200

+#define CL_SCAN_ALGORITHMIC	    0x200

 #define CL_SCAN_PHISHING_DOMAINLIST 0x400

 #define CL_SCAN_PHISHING_BLOCKSSL   0x800 /* ssl mismatches, not ssl by itself*/

 #define CL_SCAN_PHISHING_BLOCKCLOAK 0x1000

 #define CL_SCAN_ELF		    0x2000

 /* recommended scan settings */

-#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGO | CL_SCAN_ELF) 

+#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF) 

 /* aliases for backward compatibility */

 #define CL_RAW		CL_SCAN_RAW

@@ -76,7 +76,7 @@ typedef struct {

 #define SCAN_HTML	    (ctx->options & CL_SCAN_HTML)

 #define SCAN_PE		    (ctx->options & CL_SCAN_PE)

 #define SCAN_ELF	    (ctx->options & CL_SCAN_ELF)

-#define SCAN_ALGO 	    (ctx->options & CL_SCAN_ALGO)

+#define SCAN_ALGO 	    (ctx->options & CL_SCAN_ALGORITHMIC)

 #define DETECT_ENCRYPTED    (ctx->options & CL_SCAN_BLOCKENCRYPTED)

 #define BLOCKMAX	    (ctx->options & CL_SCAN_BLOCKMAX)

 #define DETECT_BROKEN	    (ctx->options & CL_SCAN_BLOCKBROKEN)