{
int i;
uint32 s1, s2;
- signed char *buf = (signed char *)buf1;
+ schar *buf = (schar *)buf1;
s1 = s2 = 0;
for (i = 0; i < (len-4); i+=4) {
}
-static void sum_put(MDstruct *md,char *sum)
-{
- SIVAL(sum,0,md->buffer[0]);
- if (csum_length <= 4) return;
- SIVAL(sum,4,md->buffer[1]);
- if (csum_length <= 8) return;
- SIVAL(sum,8,md->buffer[2]);
- if (csum_length <= 12) return;
- SIVAL(sum,12,md->buffer[3]);
-}
-
-
void get_checksum2(char *buf,int len,char *sum)
{
- int i;
- MDstruct MD;
- static char *buf1 = NULL;
- static int len1 = 0;
-
- if (len > len1) {
- if (buf1) free(buf1);
- buf1 = (char *)malloc(len+4);
- len1 = len;
- if (!buf1) out_of_memory("get_checksum2");
- }
-
- MDbegin(&MD);
-
- bcopy(buf,buf1,len);
- if (checksum_seed) {
- SIVAL(buf1,len,checksum_seed);
- len += 4;
- }
-
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- MDupdate(&MD, buf1+i, CSUM_CHUNK*8);
- }
- if (len - i > 0)
- MDupdate(&MD, buf1+i, (len-i)*8);
-
- sum_put(&MD,sum);
+ int i;
+ static char *buf1;
+ static int len1;
+ struct mdfour m;
+
+ if (len > len1) {
+ if (buf1) free(buf1);
+ buf1 = (char *)malloc(len+4);
+ len1 = len;
+ if (!buf1) out_of_memory("get_checksum2");
+ }
+
+ 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);
+ }
+ if (len - i > 0) {
+ 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)
{
- int i;
- MDstruct MD;
- struct map_struct *buf;
- int fd;
- int len = size;
- char tmpchunk[CSUM_CHUNK];
-
- bzero(sum,csum_length);
-
- fd = open(fname,O_RDONLY);
- if (fd == -1) return;
-
- buf = map_file(fd,size);
-
- MDbegin(&MD);
-
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- bcopy(map_ptr(buf,i,CSUM_CHUNK),tmpchunk,CSUM_CHUNK);
- MDupdate(&MD, tmpchunk, CSUM_CHUNK*8);
- }
-
- if (len - i > 0) {
- bcopy(map_ptr(buf,i,len-i),tmpchunk,len-i);
- MDupdate(&MD, tmpchunk, (len-i)*8);
- }
-
- sum_put(&MD,sum);
-
- close(fd);
- unmap_file(buf);
+ OFF_T i;
+ struct map_struct *buf;
+ int fd;
+ OFF_T len = size;
+ char tmpchunk[CSUM_CHUNK];
+ struct mdfour m;
+
+ memset(sum,0,MD4_SUM_LENGTH);
+
+ fd = do_open(fname, O_RDONLY, 0);
+ if (fd == -1) return;
+
+ buf = map_file(fd,size);
+
+ mdfour_begin(&m);
+
+ for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+ memcpy(tmpchunk, map_ptr(buf,i,CSUM_CHUNK), CSUM_CHUNK);
+ mdfour_update(&m, (uchar *)tmpchunk, CSUM_CHUNK);
+ }
+
+ if (len - i > 0) {
+ memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i);
+ mdfour_update(&m, (uchar *)tmpchunk, (len-i));
+ }
+
+ mdfour_result(&m, (uchar *)sum);
+
+ close(fd);
+ unmap_file(buf);
}
-static MDstruct sumMD;
static int sumresidue;
static char sumrbuf[CSUM_CHUNK];
+static struct mdfour md;
void sum_init(void)
{
- char s[4];
- MDbegin(&sumMD);
- sumresidue=0;
- SIVAL(s,0,checksum_seed);
- sum_update(s,4);
+ char s[4];
+ mdfour_begin(&md);
+ sumresidue=0;
+ SIVAL(s,0,checksum_seed);
+ sum_update(s,4);
}
void sum_update(char *p,int len)
{
- int i;
- if (len + sumresidue < CSUM_CHUNK) {
- bcopy(p,sumrbuf+sumresidue,len);
- sumresidue += len;
- return;
- }
-
- if (sumresidue) {
- i = MIN(CSUM_CHUNK-sumresidue,len);
- bcopy(p,sumrbuf+sumresidue,i);
- MDupdate(&sumMD, sumrbuf, (i+sumresidue)*8);
- len -= i;
- p += i;
- }
-
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- bcopy(p+i,sumrbuf,CSUM_CHUNK);
- MDupdate(&sumMD, sumrbuf, CSUM_CHUNK*8);
- }
-
- if (len - i > 0) {
- sumresidue = len-i;
- bcopy(p+i,sumrbuf,sumresidue);
- } else {
- sumresidue = 0;
- }
+ int i;
+ if (len + sumresidue < CSUM_CHUNK) {
+ 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));
+ 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);
+ }
+
+ if (len - i > 0) {
+ sumresidue = len-i;
+ memcpy(sumrbuf,p+i,sumresidue);
+ } else {
+ sumresidue = 0;
+ }
}
void sum_end(char *sum)
{
- if (sumresidue)
- MDupdate(&sumMD, sumrbuf, sumresidue*8);
+ if (sumresidue) {
+ mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
+ }
- SIVAL(sum,0,sumMD.buffer[0]);
- SIVAL(sum,4,sumMD.buffer[1]);
- SIVAL(sum,8,sumMD.buffer[2]);
- SIVAL(sum,12,sumMD.buffer[3]);
+ mdfour_result(&md, (uchar *)sum);
}
-
-