X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a0456b9c4635be8832fc5712454a75ec102b1176..b3bf9b9df95137a3a43248be9599d919b04877af:/checksum.c

diff --git a/checksum.c b/checksum.c
index fe8a64c0..811b5b60 100644
--- a/checksum.c
+++ b/checksum.c
@@ -3,11 +3,12 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-2007 Wayne Davison
+ * Copyright (C) 2004-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -24,8 +24,6 @@
 extern int checksum_seed;
 extern int protocol_version;
 
-int csum_length = SHORT_SUM_LENGTH; /* initial value */
-
 /*
   a simple 32 bit checksum that can be upadted from either end
   (inspired by Mark Adler's Adler-32 checksum)
@@ -56,11 +54,11 @@ void get_checksum2(char *buf, int32 len, char *sum)
 	if (protocol_version >= 30) {
 		uchar seedbuf[4];
 		md5_begin(&m);
+		md5_update(&m, (uchar *)buf, len);
 		if (checksum_seed) {
 			SIVAL(seedbuf, 0, checksum_seed);
 			md5_update(&m, seedbuf, 4);
 		}
-		md5_update(&m, (uchar *)buf, len);
 		md5_result(&m, (uchar *)sum);
 	} else {
 		int32 i;
@@ -164,9 +162,9 @@ void sum_init(int seed)
 	else {
 		mdfour_begin(&md);
 		sumresidue = 0;
+		SIVAL(s, 0, seed);
+		sum_update(s, 4);
 	}
-	SIVAL(s, 0, seed);
-	sum_update(s, 4);
 }
 
 /**