@@ -1,3 +1,10 @@

+Tue Aug 31 20:39:34 CEST 2004 (tk)

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

+  * sigtool: add support for *.hdb files in -l; include creation time in

+	     seconds in cvd header

+  * libclamav: do not load Eicar signature (detected with MD5 checksum in

+	       daily.cvd > 472)

+

 Tue Aug 31 13:43:11 CEST 2004 (acab)

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

   * libclamav/petite.c: Fixed section compacting for v2.1

@@ -415,6 +415,10 @@ static int cli_loaddb(FILE *fd, struct cl_node **root, int *virnum)

     }

     while(fgets(buffer, FILEBUFF, fd)) {

+

+	if(strstr(buffer, "Eicar")) /* FIXME: Remove me some day! */

+	    continue;

+

 	line++;

 	cli_chomp(buffer);

@@ -448,7 +452,7 @@ static int cli_loaddb(FILE *fd, struct cl_node **root, int *virnum)

 	return ret;

     }

-    if(virnum != NULL)

+    if(virnum)

 	*virnum += line;

     return 0;

@@ -535,6 +539,9 @@ static int cli_loadhdb(FILE *fd, struct cl_node **root, int *virnum)

 	return ret;

     }

+    if(virnum)

+	*virnum += line;

+

     return 0;

 }

@@ -217,7 +217,7 @@ int build(struct optstruct *opt)

 {

 	int ret, no = 0, realno = 0, bytes, itmp;

 	struct stat foo;

-	char buffer[FILEBUFF], *tarfile = NULL, *gzfile = NULL, header[257],

+	char buffer[FILEBUFF], *tarfile = NULL, *gzfile = NULL, header[512],

 	     smbuff[30], *pt;

         struct cl_node *root = NULL;

 	FILE *tar, *cvd, *fd;

@@ -236,7 +236,7 @@ int build(struct optstruct *opt)

 	exit(1);

     }

-    if(stat("viruses.db", &foo) == -1 && stat("viruses.db2", &foo) == -1) {

+    if(stat("viruses.db", &foo) == -1 && stat("viruses.db2", &foo) == -1 && stat("malware.hdb", &foo) == -1) {

 	mprintf("Virus database not found in current working directory.\n");

 	exit(1);

     }

@@ -256,7 +256,7 @@ int build(struct optstruct *opt)

 	mprintf("WARNING: There are no signatures in the database(s).\n");

     } else {

 	mprintf("Signatures: %d\n", no);

-	realno = countlines("viruses.db") + countlines("viruses.db2");

+	realno = countlines("viruses.db") + countlines("viruses.db2") + countlines("malware.hdb");

 	if(realno != no) {

 	    mprintf("!Signatures in database: %d. Loaded: %d.\n", realno, no);

@@ -274,7 +274,7 @@ int build(struct optstruct *opt)

 	    exit(1);

 	case 0:

 	    {

-		char *args[] = { "tar", "-cvf", NULL, "COPYING", "viruses.db", "viruses.db2", "Notes", "viruses.db3", NULL };

+		char *args[] = { "tar", "-cvf", NULL, "COPYING", "viruses.db", "viruses.db2", "Notes", "viruses.db3", "malware.hdb", NULL };

 		args[2] = tarfile;

 		execv("/bin/tar", args);

 		mprintf("!Can't execute tar\n");

@@ -358,7 +358,7 @@ int build(struct optstruct *opt)

     free(pt);

     strcat(header, ":");

-    /* builder - question */

+    /* ask for builder name */

     fflush(stdin);

     mprintf("Builder id: ");

     fscanf(stdin, "%s", smbuff);

@@ -377,9 +377,12 @@ int build(struct optstruct *opt)

     free(pt);

     strcat(header, ":");

-    /* builder - add */

+    /* add builder */

     strcat(header, smbuff);

+    /* add current time */

+    sprintf(header + strlen(header), ":%d", (int) timet);

+

     /* fill up with spaces */

     while(strlen(header) < 512)

@@ -638,26 +641,49 @@ int listdb(const char *filename)

 	return 0;

     }

+    if(cli_strbcasestr(filename, ".db") || cli_strbcasestr(filename, ".db2")) {

+	/* old style database */

+

+	while(fgets(buffer, FILEBUFF, fd)) {

+	    line++;

+	    pt = strchr(buffer, '=');

+	    if(!pt) {

+		mprintf("!listdb(): Malformed pattern line %d (file %s).\n", line, filename);

+		fclose(fd);

+		free(buffer);

+		return -1;

+	    }

-    /* old style database */

+	    start = buffer;

+	    *pt = 0;

-    while(fgets(buffer, FILEBUFF, fd)) {

-	line++;

-	pt = strchr(buffer, '=');

-	if(!pt) {

-	    mprintf("!listdb(): Malformed pattern line %d (file %s).\n", line, filename);

-	    fclose(fd);

-	    free(buffer);

-	    return -1;

+	    if((pt = strstr(start, " (Clam)")))

+		*pt = 0;

+

+	    mprintf("%s\n", start);

 	}

-	start = buffer;

-	*pt = 0;

+    } else if(cli_strbcasestr(filename, ".hdb")) {

-	if((pt = strstr(start, " (Clam)")))

-	    *pt = 0;

+	while(fgets(buffer, FILEBUFF, fd)) {

+	    line++;

+	    cli_chomp(buffer);

+	    start = cli_strtok(buffer, 2, ":");

+

+	    if(!start) {

+		mprintf("!listdb(): Malformed pattern line %d (file %s).\n", line, filename);

+		fclose(fd);

+		free(buffer);

+		return -1;

+	    }

+

+	    if((pt = strstr(start, " (Clam)")))

+		*pt = 0;

+

+	    mprintf("%s\n", start);

+	    free(start);

+	}

-	mprintf("%s\n", start);

     }

     fclose(fd);

@@ -685,6 +711,7 @@ int listdir(const char *dirname)

 	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") &&

 	    (cli_strbcasestr(dent->d_name, ".db")  ||

 	     cli_strbcasestr(dent->d_name, ".db2") ||

+	     cli_strbcasestr(dent->d_name, ".hdb") ||

 	     cli_strbcasestr(dent->d_name, ".cvd"))) {

 		dbfile = (char *) mcalloc(strlen(dent->d_name) + strlen(dirname) + 2, sizeof(char));