Merged in the security fixes from 2.5.7.

[rsync/rsync.git] / checksum.c

diff --git a/checksum.c b/checksum.c
index dd70039..3acd970 100644 (file)
--- a/checksum.c
+++ b/checksum.c
@@ -24,7 +24,7 @@ int csum_length=2; /* initial value */
 #define CSUM_CHUNK 64
 
 int checksum_seed = 0;
-extern int remote_version;
+extern int protocol_version;
 
 /*
   a simple 32 bit checksum that can be upadted from either end
@@ -58,7 +58,7 @@ void get_checksum2(char *buf,int len,char *sum)
 
        if (len > len1) {
                if (buf1) free(buf1);
-               buf1 = (char *)malloc(len+4);
+               buf1 = new_array(char, len+4);
                len1 = len;
                if (!buf1) out_of_memory("get_checksum2");
        }
@@ -72,13 +72,19 @@ void get_checksum2(char *buf,int len,char *sum)
        }
        
        for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
-               mdfour_update(&m, buf1+i, CSUM_CHUNK);
+               mdfour_update(&m, (uchar *)(buf1+i), CSUM_CHUNK);
        }
-       if (len - i > 0) {
-               mdfour_update(&m, buf1+i, (len-i));
+       /*
+        * Prior to version 27 an incorrect MD4 checksum was computed
+        * by failing to call mdfour_tail() for block sizes that
+        * are multiples of 64.  This is fixed by calling mdfour_update()
+        * even when there are no more bytes.
+        */
+       if (len - i > 0 || protocol_version >= 27) {
+               mdfour_update(&m, (uchar *)(buf1+i), (len-i));
        }
        
-       mdfour_result(&m, sum);
+       mdfour_result(&m, (uchar *)sum);
 }
 
 
@@ -91,9 +97,9 @@ void file_checksum(char *fname,char *sum,OFF_T size)
        char tmpchunk[CSUM_CHUNK];
        struct mdfour m;
        
-       memset(sum,0,csum_length);
+       memset(sum,0,MD4_SUM_LENGTH);
        
-       fd = open(fname,O_RDONLY);
+       fd = do_open(fname, O_RDONLY, 0);
        if (fd == -1) return;
        
        buf = map_file(fd,size);
@@ -102,31 +108,29 @@ void file_checksum(char *fname,char *sum,OFF_T size)
 
        for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
                memcpy(tmpchunk, map_ptr(buf,i,CSUM_CHUNK), CSUM_CHUNK);
-               mdfour_update(&m, tmpchunk, CSUM_CHUNK);
+               mdfour_update(&m, (uchar *)tmpchunk, CSUM_CHUNK);
        }
 
+       /*
+        * Prior to version 27 an incorrect MD4 checksum was computed
+        * by failing to call mdfour_tail() for block sizes that
+        * are multiples of 64.  This is fixed by calling mdfour_update()
+        * even when there are no more bytes.
+        */
        if (len - i > 0) {
                memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i);
-               mdfour_update(&m, tmpchunk, (len-i));
+       }
+       if (len - i > 0 || protocol_version >= 27) {
+               mdfour_update(&m, (uchar *)tmpchunk, (len-i));
        }
 
-       mdfour_result(&m, sum);
+       mdfour_result(&m, (uchar *)sum);
 
        close(fd);
        unmap_file(buf);
 }
 
 
-void checksum_init(void)
-{
-  if (remote_version >= 14)
-    csum_length = 2; /* adaptive */
-  else
-    csum_length = SUM_LENGTH;
-}
-
-
-
 static int sumresidue;
 static char sumrbuf[CSUM_CHUNK];
 static struct mdfour md;
@@ -140,7 +144,15 @@ void sum_init(void)
        sum_update(s,4);
 }
 
-void sum_update(char *p,int len)
+/**
+ * Feed data into an MD4 accumulator, md.  The results may be
+ * retrieved using sum_end().  md is used for different purposes at
+ * different points during execution.
+ *
+ * @todo Perhaps get rid of md and just pass in the address each time.
+ * Very slightly clearer and slower.
+ **/
+void sum_update(char *p, int len)
 {
        int i;
        if (len + sumresidue < CSUM_CHUNK) {
@@ -152,14 +164,14 @@ void sum_update(char *p,int len)
        if (sumresidue) {
                i = MIN(CSUM_CHUNK-sumresidue,len);
                memcpy(sumrbuf+sumresidue,p,i);
-               mdfour_update(&md, sumrbuf, (i+sumresidue));
+               mdfour_update(&md, (uchar *)sumrbuf, (i+sumresidue));
                len -= i;
                p += i;
        }
 
        for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
                memcpy(sumrbuf,p+i,CSUM_CHUNK);
-               mdfour_update(&md, sumrbuf, CSUM_CHUNK);
+               mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK);
        }
 
        if (len - i > 0) {
@@ -172,9 +184,9 @@ void sum_update(char *p,int len)
 
 void sum_end(char *sum)
 {
-       if (sumresidue) {
-               mdfour_update(&md, sumrbuf, sumresidue);
+       if (sumresidue || protocol_version >= 27) {
+               mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
        }
 
-       mdfour_result(&md, sum);
+       mdfour_result(&md, (uchar *)sum);
 }