a simple 32 bit checksum that can be upadted from either end
(inspired by Mark Adler's Adler-32 checksum)
*/
-uint32 get_checksum1(char *buf1,int len)
+uint32 get_checksum1(char *buf1, int32 len)
{
- int i;
+ int32 i;
uint32 s1, s2;
schar *buf = (schar *)buf1;
}
-void get_checksum2(char *buf,int len,char *sum)
+void get_checksum2(char *buf, int32 len, char *sum)
{
- int i;
+ int32 i;
static char *buf1;
- static int len1;
+ static int32 len1;
struct mdfour m;
if (len > len1) {
- if (buf1) free(buf1);
+ if (buf1)
+ free(buf1);
buf1 = new_array(char, len+4);
len1 = len;
- if (!buf1) out_of_memory("get_checksum2");
+ if (!buf1)
+ out_of_memory("get_checksum2");
}
mdfour_begin(&m);
if (fd == -1)
return;
- buf = map_file(fd, size, CSUM_CHUNK * 2048, 0);
+ buf = map_file(fd, size, MAX_MAP_SIZE, CSUM_CHUNK);
mdfour_begin(&m);
}
-static int sumresidue;
+static int32 sumresidue;
static char sumrbuf[CSUM_CHUNK];
static struct mdfour md;
* @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)
+void sum_update(char *p, int32 len)
{
- int i;
if (len + sumresidue < CSUM_CHUNK) {
- memcpy(sumrbuf+sumresidue, p, len);
+ memcpy(sumrbuf + sumresidue, p, len);
sumresidue += len;
return;
}
if (sumresidue) {
- i = MIN(CSUM_CHUNK-sumresidue,len);
- memcpy(sumrbuf+sumresidue,p,i);
- mdfour_update(&md, (uchar *)sumrbuf, (i+sumresidue));
+ int32 i = CSUM_CHUNK - sumresidue;
+ memcpy(sumrbuf + sumresidue, p, i);
+ mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK);
len -= i;
p += i;
}
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- memcpy(sumrbuf,p+i,CSUM_CHUNK);
- mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK);
+ while (len >= CSUM_CHUNK) {
+ mdfour_update(&md, (uchar *)p, CSUM_CHUNK);
+ len -= CSUM_CHUNK;
+ p += CSUM_CHUNK;
}
- if (len - i > 0) {
- sumresidue = len-i;
- memcpy(sumrbuf,p+i,sumresidue);
- } else {
- sumresidue = 0;
- }
+ sumresidue = len;
+ if (sumresidue)
+ memcpy(sumrbuf, p, sumresidue);
}
void sum_end(char *sum)
{
- if (sumresidue || protocol_version >= 27) {
+ if (sumresidue || protocol_version >= 27)
mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
- }
mdfour_result(&md, (uchar *)sum);
}