[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 70710eff882704b39cbba916bfc485237f6a24d6
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:14 2008 +0100

    Revert "verify MD5's in --run-cdiff"
    
    This reverts commit 2e3923b2872313c9da146e43ccfc48f9594281d9.

diff --git a/ChangeLog b/ChangeLog
index a8556e4..6ab3742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Wed Jul  2 12:43:46 CEST 2008 (tk)
-----------------------------------
-  * sigtool/sigtool.c: verify MD5's in --run-cdiff
-
 Tue Jul  1 14:13:21 CEST 2008 (tk)
 ----------------------------------
   * libclamav/matcher-ac.c: fix handling of nodes which also match single
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 08a1de3..c1a851b 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1222,56 +1222,6 @@ static int vbadump(struct optstruct *opt)
     return 0;
 }
 
-static int comparemd5(const char *dbname)
-{
-	char info[16], buff[256], *md5, *pt;
-	FILE *fh;
-	int ret = 0;
-
-
-    if(strstr(dbname, "main"))
-	strcpy(info, "main.info");
-    else
-	strcpy(info, "daily.info");
-
-    if(!(fh = fopen(info, "r"))) {
-	mprintf("!verifydiff: Can't open %s\n", info);
-	return -1;
-    }
-
-    if(!fgets(buff, sizeof(buff), fh) || strncmp(buff, "ClamAV-VDB", 10)) {
-	mprintf("!verifydiff: Incorrect info file %s\n", info);
-	fclose(fh);
-	return -1;
-    }
-
-    while(fgets(buff, sizeof(buff), fh)) {
-	cli_chomp(buff);
-	if(!(pt = strchr(buff, ':'))) {
-	    mprintf("!verifydiff: Incorrect format of %s\n", info);
-	    ret = -1;
-	    break;
-	}
-	*pt++ = 0;
-	if(!(md5 = cli_md5file(buff))) {
-	    mprintf("!verifydiff: Can't generate MD5 for %s\n", buff);
-	    ret = -1;
-	    break;
-	}
-	if(strcmp(pt, md5)) {
-	    mprintf("!verifydiff: %s has incorrect checksum\n", buff);
-	    ret = -1;
-	    free(md5);
-	    break;
-	}
-	free(md5);
-    }
-
-    fclose(fh);
-    return ret;
-}
-
-
 static int rundiff(struct optstruct *opt)
 {
 	int fd, ret;
@@ -1297,9 +1247,6 @@ static int rundiff(struct optstruct *opt)
     ret = cdiff_apply(fd, mode);
     close(fd);
 
-    if(!ret)
-	ret = comparemd5(diff);
-
     return ret;
 }
 
@@ -1409,7 +1356,8 @@ static int compare(const char *oldpath, const char *newpath, FILE *diff)
 
 static int verifydiff(const char *diff, const char *cvd, const char *incdir)
 {
-	char *tempdir, cwd[512];
+	char *tempdir, cwd[512], buff[1024], info[32], *md5, *pt;
+	FILE *fh;
 	int ret = 0, fd;
 	unsigned short mode;
 
@@ -1484,8 +1432,50 @@ static int verifydiff(const char *diff, const char *cvd, const char *incdir)
     }
     close(fd);
 
-    ret = comparemd5(diff);
+    if(strstr(diff, "main"))
+	strcpy(info, "main.info");
+    else
+	strcpy(info, "daily.info");
 
+    if(!(fh = fopen(info, "r"))) {
+	mprintf("!verifydiff: Can't open %s\n", info);
+	if(chdir(cwd) == -1)
+	    mprintf("^verifydiff: Can't chdir to %s\n", cwd);
+	cli_rmdirs(tempdir);
+	free(tempdir);
+	return -1;
+    }
+
+    if(!fgets(buff, sizeof(buff), fh) || strncmp(buff, "ClamAV-VDB", 10)) {
+	mprintf("!verifydiff: Incorrect info file %s\n", info);
+	if(chdir(cwd) == -1)
+	    mprintf("^verifydiff: Can't chdir to %s\n", cwd);
+	cli_rmdirs(tempdir);
+	free(tempdir);
+	return -1;
+    }
+
+    while(fgets(buff, sizeof(buff), fh)) {
+	cli_chomp(buff);
+	if(!(pt = strchr(buff, ':'))) {
+	    mprintf("!verifydiff: Incorrect format of %s\n", info);
+	    ret = -1;
+	    break;
+	}
+	*pt++ = 0;
+	if(!(md5 = cli_md5file(buff))) {
+	    mprintf("!verifydiff: Can't generate MD5 for %s\n", buff);
+	    ret = -1;
+	    break;
+	}
+	if(strcmp(pt, md5)) {
+	    mprintf("!verifydiff: %s has incorrect checksum\n", buff);
+	    ret = -1;
+	    break;
+	}
+    }
+
+    fclose(fh);
     if(chdir(cwd) == -1)
 	mprintf("^verifydiff: Can't chdir to %s\n", cwd);
     cli_rmdirs(tempdir);

-- 
Debian repository for ClamAV