*** empty log message ***

[rsync/rsync.git] / checksum.c

diff --git a/checksum.c b/checksum.c
index 0ce7259..7484ca5 100644 (file)
--- a/checksum.c
+++ b/checksum.c
@@ -74,7 +74,13 @@ void get_checksum2(char *buf,int len,char *sum)
        for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
                mdfour_update(&m, (uchar *)(buf1+i), CSUM_CHUNK);
        }
-       if (len - i > 0) {
+       /*
+        * 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 || remote_version >= 27) {
                mdfour_update(&m, (uchar *)(buf1+i), (len-i));
        }
        
@@ -105,8 +111,16 @@ void file_checksum(char *fname,char *sum,OFF_T size)
                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);
+       }
+       if (len - i > 0 || remote_version >= 27) {
                mdfour_update(&m, (uchar *)tmpchunk, (len-i));
        }
 
@@ -117,16 +131,6 @@ void file_checksum(char *fname,char *sum,OFF_T size)
 }
 
 
-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) {
@@ -172,7 +184,7 @@ void sum_update(char *p,int len)
 
 void sum_end(char *sum)
 {
-       if (sumresidue) {
+       if (sumresidue || remote_version >= 27) {
                mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
        }