*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004, 2005 Wayne Davison
+ * Copyright (C) 2004-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
-int csum_length=2; /* initial value */
-
-#define CSUM_CHUNK 64
-
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)
void get_checksum2(char *buf, int32 len, char *sum)
{
- int32 i;
- static char *buf1;
- static int32 len1;
- struct mdfour m;
-
- if (len > len1) {
- if (buf1)
- free(buf1);
- buf1 = new_array(char, len+4);
- len1 = len;
- if (!buf1)
- out_of_memory("get_checksum2");
+ md_context m;
+
+ 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_result(&m, (uchar *)sum);
+ } else {
+ int32 i;
+ static char *buf1;
+ static int32 len1;
+
+ mdfour_begin(&m);
+
+ if (len > len1) {
+ if (buf1)
+ free(buf1);
+ buf1 = new_array(char, len+4);
+ len1 = len;
+ if (!buf1)
+ out_of_memory("get_checksum2");
+ }
+
+ memcpy(buf1, buf, len);
+ if (checksum_seed) {
+ SIVAL(buf1,len,checksum_seed);
+ len += 4;
+ }
+
+ for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK)
+ mdfour_update(&m, (uchar *)(buf1+i), 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 || protocol_version >= 27)
+ mdfour_update(&m, (uchar *)(buf1+i), len-i);
+
+ mdfour_result(&m, (uchar *)sum);
}
-
- mdfour_begin(&m);
-
- memcpy(buf1,buf,len);
- if (checksum_seed) {
- SIVAL(buf1,len,checksum_seed);
- len += 4;
- }
-
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- mdfour_update(&m, (uchar *)(buf1+i), 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 || protocol_version >= 27) {
- mdfour_update(&m, (uchar *)(buf1+i), (len-i));
- }
-
- mdfour_result(&m, (uchar *)sum);
}
-
-void file_checksum(char *fname,char *sum,OFF_T size)
+void file_checksum(char *fname, char *sum, OFF_T size)
{
- OFF_T i;
struct map_struct *buf;
+ OFF_T i, len = size;
+ md_context m;
+ int32 remainder;
int fd;
- OFF_T len = size;
- struct mdfour m;
- memset(sum,0,MD4_SUM_LENGTH);
+ memset(sum, 0, MAX_DIGEST_LEN);
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1)
buf = map_file(fd, size, MAX_MAP_SIZE, CSUM_CHUNK);
- mdfour_begin(&m);
+ if (protocol_version >= 30) {
+ md5_begin(&m);
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- mdfour_update(&m, (uchar *)map_ptr(buf, i, CSUM_CHUNK),
- CSUM_CHUNK);
- }
+ for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+ md5_update(&m, (uchar *)map_ptr(buf, i, CSUM_CHUNK),
+ CSUM_CHUNK);
+ }
+
+ remainder = (int32)(len - i);
+ if (remainder > 0)
+ md5_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
- /* 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 *)map_ptr(buf, i, len-i), len-i);
+ md5_result(&m, (uchar *)sum);
+ } else {
+ mdfour_begin(&m);
- mdfour_result(&m, (uchar *)sum);
+ for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+ mdfour_update(&m, (uchar *)map_ptr(buf, i, CSUM_CHUNK),
+ 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. */
+ remainder = (int32)(len - i);
+ if (remainder > 0 || protocol_version >= 27)
+ mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
+
+ mdfour_result(&m, (uchar *)sum);
+ }
close(fd);
unmap_file(buf);
}
-
static int32 sumresidue;
-static char sumrbuf[CSUM_CHUNK];
-static struct mdfour md;
+static md_context md;
void sum_init(int seed)
{
char s[4];
- mdfour_begin(&md);
- sumresidue = 0;
+
+ if (protocol_version >= 30)
+ md5_begin(&md);
+ else {
+ mdfour_begin(&md);
+ sumresidue = 0;
+ }
SIVAL(s, 0, seed);
sum_update(s, 4);
}
* @todo Perhaps get rid of md and just pass in the address each time.
* Very slightly clearer and slower.
**/
-void sum_update(char *p, int32 len)
+void sum_update(const char *p, int32 len)
{
+ if (protocol_version >= 30) {
+ md5_update(&md, (uchar *)p, len);
+ return;
+ }
+
if (len + sumresidue < CSUM_CHUNK) {
- memcpy(sumrbuf + sumresidue, p, len);
+ memcpy(md.buffer + sumresidue, p, len);
sumresidue += len;
return;
}
if (sumresidue) {
int32 i = CSUM_CHUNK - sumresidue;
- memcpy(sumrbuf + sumresidue, p, i);
- mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK);
+ memcpy(md.buffer + sumresidue, p, i);
+ mdfour_update(&md, (uchar *)md.buffer, CSUM_CHUNK);
len -= i;
p += i;
}
sumresidue = len;
if (sumresidue)
- memcpy(sumrbuf, p, sumresidue);
+ memcpy(md.buffer, p, sumresidue);
}
-void sum_end(char *sum)
+int sum_end(char *sum)
{
+ if (protocol_version >= 30) {
+ md5_result(&md, (uchar *)sum);
+ return MD5_DIGEST_LEN;
+ }
+
if (sumresidue || protocol_version >= 27)
- mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
+ mdfour_update(&md, (uchar *)md.buffer, sumresidue);
mdfour_result(&md, (uchar *)sum);
+
+ return MD4_DIGEST_LEN;
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff