more merging fun from the hampton branch. I'm pretty sure this doesn't

work now, at least in gui.  text mode might, though

5 files changed, 659 insertions, 0 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 378b7c09b..66693ee9a 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -33,6 +33,15 @@ moddeps: moddeps.o moduledeps.o
 	    -lmodutils -lmodutilobj -lmodutilutil  \
 	    -lpopt -lbz2
 
+md5.o: md5.c md5.h
+	gcc -c -O -g md5.c
+
+implantisomd5: implantisomd5.c md5.o
+	gcc -O -g -o implantisomd5 implantisomd5.c md5.o -lm
+
+checkisomd5: checkisomd5.c md5.o
+	gcc -O -g -o checkisomd5 -DTESTING checkisomd5.c md5.o -lm
+
 genhdlist: genhdlist.c hash.c
 	$(CC) $(LDFLAGS) $(CFLAGS) $(RPMCFLAGS) -o genhdlist genhdlist.c hash.c -lrpm -lrpmdb -lrpmio \
 	-lbz2 -lz -lpopt 
@@ -48,12 +57,15 @@ install: all
 	install -m755 filtermoddeps $(DESTDIR)/$(RUNTIMEDIR)
 	install -m755 -s modlist $(DESTDIR)/$(RUNTIMEDIR)
 	install -m755 -s checkcards.py $(DESTDIR)/$(RUNTIMEDIR)
+	install -m755 -s checkisomd5 $(DESTDIR)/$(RUNTIMEDIR)
+	install -m755 -s implantisomd5 $(DESTDIR)/$(RUNTIMEDIR)
 
 #
 # removed genhdlist from clean line so it will be distributed on CDROM image
 #
 clean:	
 	rm -f modlist moddeps snarffont genhdlist mapshdr readmap *.o 
+	rm -f implantisomd5 checkisomd5
 
 depend:
 	$(CPP) -M $(CFLAGS) *.c > .depend
diff --git a/utils/checkisomd5.c b/utils/checkisomd5.c
new file mode 100644
index 000000000..0f427164e
--- /dev/null
+++ b/utils/checkisomd5.c
@@ -0,0 +1,184 @@
+/* simple program to check implanted md5sum in an iso 9660 image   */
+/* Copyright 2001 Red Hat, Inc.                                    */
+/* Michael Fulbright msf@redhat.com                                */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "md5.h"
+
+
+/* number of sectors to ignore at end of iso when computing sum */
+#define SKIPSECTORS 150
+
+#define APPDATA_OFFSET 883
+#define SIZE_OFFSET 84
+
+#define MAX(x, y)  ((x > y) ? x : y)
+#define MIN(x, y)  ((x < y) ? x : y)
+
+
+
+/* finds primary volume descriptor and returns info from it */
+/* mediasum must be a preallocated buffer at least 33 bytes long */
+int parsepvd(int isofd, char *mediasum, long long *isosize) {
+    unsigned char buf[2048];
+    long long offset;
+    unsigned char *p;
+
+    if (lseek(isofd, (off_t)(16L * 2048L), SEEK_SET) == -1)
+	return ((long long)-1);
+
+    offset = (16L * 2048L);
+    for (;1;) {
+	read(isofd, buf, 2048);
+	if (buf[0] == 1)
+	    /* found primary volume descriptor */
+	    break;
+	else if (buf[0] == 255)
+	    /* hit end and didn't find primary volume descriptor */
+	    return ((long long)-1);
+	offset += 2048L;
+    }
+    
+    /* read out md5sum */
+    memcpy(mediasum, buf + APPDATA_OFFSET + 13, 32);
+    mediasum[32] = '\0';
+
+    for (p=mediasum; *p; p++)
+	if (*p != ' ')
+	    break;
+
+    /* if the md5sum was all spaces, we didn't find md5sum */
+    if (!*p)
+	return -1;
+
+    /* get isosize */
+    *isosize = (buf[SIZE_OFFSET]*0x1000000+buf[SIZE_OFFSET+1]*0x10000 +
+		buf[SIZE_OFFSET+2]*0x100 + buf[SIZE_OFFSET+3]) * 2048LL;
+
+    return offset;
+}
+
+/* returns -1 if no checksum encoded in media, 0 if no match, 1 if match */
+/* mediasum is the sum encoded in media, computedsum is one we compute   */
+/* both strings must be pre-allocated at least 33 chars in length        */
+int checkmd5sum(int isofd, char *mediasum, char *computedsum) {
+    int nread;
+    int i;
+    int appdata_start_offset, appdata_end_offset;
+    int nattempt;
+    unsigned int bufsize = 32768;
+    unsigned char md5sum[16];
+    unsigned int len;
+    unsigned char *buf;
+    unsigned long tally_inc, tally;
+    long long isosize, offset, pvd_offset, apoff;
+    MD5_CTX md5ctx;
+
+    if ((pvd_offset = parsepvd(isofd, mediasum, &isosize)) < 0)
+	return -1;
+
+    /*    printf("Mediasum = %s\n",mediasum); */
+
+    /* rewind, compute md5sum */
+    lseek(isofd, 0L, SEEK_SET);
+
+    MD5_Init(&md5ctx);
+
+    offset = 0;
+    apoff = pvd_offset + APPDATA_OFFSET;
+
+    buf = malloc(bufsize * sizeof(unsigned char));
+    tally_inc = 50*1000*1000;
+    tally = 0;
+    while (offset < isosize - SKIPSECTORS*2048) {
+	nattempt = MIN(isosize - SKIPSECTORS*2048 - offset, bufsize);
+
+	/*	printf("%lld %lld %lld %d\n", offset, isosize, isosize-SKIPSECTORS*2048, nattempt); */
+
+	nread = read(isofd, buf, nattempt);
+	if (nread <= 0)
+	    break;
+
+	/* overwrite md5sum we implanted with original data */
+	if (offset < apoff && offset+nread >= apoff) {
+	    appdata_start_offset = apoff - offset;
+	    appdata_end_offset = MIN(appdata_start_offset+MIN(nread, 512),
+				     offset + nread - apoff);
+	    len = appdata_end_offset - appdata_start_offset;
+	    memset(buf+appdata_start_offset, ' ', len);
+	} else if (offset >= apoff && offset+nread < apoff + 512) {
+	    appdata_start_offset = 0;
+	    appdata_end_offset = nread;
+	    len = appdata_end_offset - appdata_start_offset;
+	    memset(buf+appdata_start_offset, ' ', len);
+	} else if (offset < apoff + 512 && offset+nread >= apoff + 512) {
+	    appdata_start_offset = 0;
+	    appdata_end_offset = apoff + 512 - offset;
+	    len = appdata_end_offset - appdata_start_offset;
+	    memset(buf+appdata_start_offset, ' ', len);
+	}
+
+	MD5_Update(&md5ctx, buf, nread);
+	offset = offset + nread;
+	if (offset >= tally) {
+	    printf("Read %5d MB\n", tally/1000/1000);
+	    tally += tally_inc;
+	}
+    }
+
+    sleep(1);
+
+    free(buf);
+
+    MD5_Final(md5sum, &md5ctx);
+
+    *computedsum = '\0';
+    for (i=0; i<16; i++) {
+	char tmpstr[4];
+	snprintf (tmpstr, 4, "%02x", md5sum[i]);
+	strcat(computedsum, tmpstr);
+    }
+
+    /*    printf("mediasum, computedsum = %s %s\n", mediasum, computedsum); */
+
+    if (strcmp(mediasum, computedsum))
+	return 0;
+    else
+	return 1;
+    }
+
+
+int main(int argc, char **argv) {
+    int isofd;
+    int rc;
+    unsigned char mediasum[33], computedsum[33];
+
+    if (argc < 2) {
+	printf("Usage: checkisomd5 <isofilename>\n\n");
+	exit(1);
+    }
+
+    isofd = open(argv[1], O_RDONLY);
+
+    if (isofd < 0) {
+	fprintf(stderr, "Error - Unable to open file %s\n\n", argv[1]);
+	exit(1);
+    }
+    
+    rc = checkmd5sum(isofd, mediasum, computedsum);
+    printf("%s\n%s\n", mediasum, computedsum);
+    if ( rc == 0)
+	printf("Md5sums differ.\n");
+    else if (rc > 0)
+	printf("Md5sums match.\n");
+    else
+	printf("No checksum information in iso, check skipped.\n");
+
+    close(isofd);
+}
+
diff --git a/utils/implantisomd5.c b/utils/implantisomd5.c
new file mode 100644
index 000000000..a2822495a
--- /dev/null
+++ b/utils/implantisomd5.c
@@ -0,0 +1,182 @@
+/* simple program to insert a md5sum into application data area of */
+/* an iso9660 image                                                */
+/* Copyright 2001 Red Hat, Inc.                                    */
+/* Michael Fulbright msf@redhat.com                                */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "md5.h"
+
+#define APPDATA_OFFSET 883
+#define SIZE_OFFSET 84
+
+/* number of sectors to ignore at end of iso when computing sum */
+#define SKIPSECTORS 150
+
+#define MAX(x, y)  ((x > y) ? x : y)
+#define MIN(x, y)  ((x < y) ? x : y)
+
+/* finds primary volume descriptor and returns info from it */
+/* mediasum must be a preallocated buffer at least 33 bytes long */
+int parsepvd(int isofd, char *mediasum, long long *isosize) {
+    unsigned char buf[2048];
+    long long offset;
+    unsigned char *p;
+
+    if (lseek(isofd, (off_t)(16L * 2048L), SEEK_SET) == -1)
+	return ((long long)-1);
+
+    offset = (16L * 2048L);
+    for (;1;) {
+	read(isofd, buf, 2048);
+	if (buf[0] == 1)
+	    /* found primary volume descriptor */
+	    break;
+	else if (buf[0] == 255)
+	    /* hit end and didn't find primary volume descriptor */
+	    return ((long long)-1);
+	offset += 2048L;
+    }
+    
+    /* read out md5sum */
+#if 0
+    memcpy(mediasum, buf + APPDATA_OFFSET + 13, 32);
+    mediasum[32] = '\0';
+
+    for (p=mediasum; *p; p++)
+	if (*p != ' ')
+	    break;
+
+    /* if the md5sum was all spaces, we didn't find md5sum */
+    if (!*p)
+	return -1;
+#endif
+
+    /* get isosize */
+    *isosize = (buf[SIZE_OFFSET]*0x1000000+buf[SIZE_OFFSET+1]*0x10000 +
+		buf[SIZE_OFFSET+2]*0x100 + buf[SIZE_OFFSET+3]) * 2048LL;
+
+    return offset;
+}
+
+
+
+int main(int argc, char **argv) {
+    int isofd;
+    int nread;
+    int i;
+    int dirty;
+    int pvd_offset;
+    int forceit;
+    long long isosize;
+    unsigned char md5sum[16];
+    unsigned int total;
+    unsigned char *fname;
+    unsigned char buf[2048];
+    unsigned char orig_appdata[512];
+    unsigned char new_appdata[512];
+    unsigned char mediasum[33], computedsum[33];
+    unsigned long tally_inc, tally;
+    char md5str[40];
+    MD5_CTX md5ctx;
+
+    if (argc < 2) {
+	printf("Usage: implantisomd5 [-f] <isofilename>\n\n");
+	exit(1);
+    }
+
+    if (!strncmp(argv[1] , "-f", 3)) {
+	forceit = 1;
+	fname = argv[2];
+    } else {
+	forceit = 0;
+	fname = argv[1];
+    }
+
+    isofd = open(fname, O_RDWR);
+
+    if (isofd < 0) {
+	fprintf(stderr, "Error - Unable to open file %s\n\n", fname);
+	exit(1);
+    }
+
+    pvd_offset = parsepvd(isofd, mediasum, &isosize);
+    if (pvd_offset < 0) {
+	fprintf(stderr, "Could not find primary volumne!\n\n");
+	exit(1);
+    }
+
+    lseek(isofd, pvd_offset + APPDATA_OFFSET, SEEK_SET);
+    nread = read(isofd, orig_appdata, 512);
+
+    if (!forceit) {
+	dirty = 0;
+	for (i=0; i < 512; i++)
+	    if (orig_appdata[i] != ' ')
+		dirty = 1;
+
+	if (dirty) {
+	    fprintf(stderr, "Application data has been used - not implanting md5sum!\n");
+	    exit(1);
+	}
+    }
+
+
+    lseek(isofd, 0L, SEEK_SET);
+
+    MD5_Init(&md5ctx);
+
+    total = 0;
+    /* read up to 15 sectors from end, due to problems reading last few */
+    /* sectors on burned CDs                                            */
+    tally_inc = 50*1000*1000;
+    tally = 0;
+    while (total < isosize - SKIPSECTORS*2048) {
+	nread = read(isofd, buf, 2048);
+	if (nread <= 0)
+	    break;
+
+	MD5_Update(&md5ctx, buf, nread);
+	total = total + nread;
+
+	if (total >= tally) {
+	    printf("Read %5d MB\n", tally/1000/1000);
+	    tally += tally_inc;
+	}
+    }
+
+    MD5_Final(md5sum, &md5ctx);
+
+    *md5str = '\0';
+    for (i=0; i<16; i++) {
+	char tmpstr[4];
+	snprintf (tmpstr, 4, "%02x", md5sum[i]);
+	strcat(md5str, tmpstr);
+    }
+
+    printf("Inserting md5sum into iso image...\n");
+    printf("md5 = %s\n", md5str);
+    /*    memcpy(new_appdata, orig_appdata, 512); */
+    memset(new_appdata, ' ', 512);
+    memcpy(new_appdata, "ISO MD5SUM = ", 13);
+    memcpy(new_appdata+13, md5str, 33);
+    memcpy(new_appdata+47, "THIS IS NOT THE SAME AS RUNNING MD5SUM ON THIS ISO!!", 51);
+
+    i = lseek(isofd, pvd_offset + APPDATA_OFFSET, SEEK_SET);
+    if (i<0)
+	printf("seek failed\n");
+
+    i = write(isofd, new_appdata, 512);
+    if (i<0) {
+	printf("write failed %d\n", i);
+	perror("");
+    }
+
+    close(isofd);
+
+    printf("Done!\n");
+}
diff --git a/utils/md5.c b/utils/md5.c
new file mode 100644
index 000000000..fe032ebba
--- /dev/null
+++ b/utils/md5.c
@@ -0,0 +1,256 @@
+/*
+ * $Id$
+ *
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ *
+ */
+
+#include <string.h>
+#include "md5.h"
+
+#ifndef HIGHFIRST
+#define byteReverse(buf, len)	/* Nothing */
+#else
+static void byteReverse(unsigned char *buf, unsigned longs);
+
+#ifndef ASM_MD5
+/*
+ * Note: this code is harmless on little-endian machines.
+ */
+static void byteReverse(unsigned char *buf, unsigned longs)
+{
+	uint32 t;
+	do {
+		t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+		    ((unsigned) buf[1] << 8 | buf[0]);
+		*(uint32 *) buf = t;
+		buf += 4;
+	} while (--longs);
+}
+#endif
+#endif
+
+/*
+ * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+void MD5_Init(struct MD5Context *ctx)
+{
+	ctx->buf[0] = 0x67452301U;
+	ctx->buf[1] = 0xefcdab89U;
+	ctx->buf[2] = 0x98badcfeU;
+	ctx->buf[3] = 0x10325476U;
+
+	ctx->bits[0] = 0;
+	ctx->bits[1] = 0;
+}
+
+/*
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+void MD5_Update(struct MD5Context *ctx, unsigned const char *buf, unsigned len)
+{
+	uint32 t;
+
+	/* Update bitcount */
+
+	t = ctx->bits[0];
+	if ((ctx->bits[0] = t + ((uint32) len << 3)) < t)
+		ctx->bits[1]++;	/* Carry from low to high */
+	ctx->bits[1] += len >> 29;
+
+	t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
+
+	/* Handle any leading odd-sized chunks */
+
+	if (t) {
+		unsigned char *p = (unsigned char *) ctx->in + t;
+
+		t = 64 - t;
+		if (len < t) {
+			memcpy(p, buf, len);
+			return;
+		}
+		memcpy(p, buf, t);
+		byteReverse(ctx->in, 16);
+		MD5_Transform(ctx->buf, (uint32 *) ctx->in);
+		buf += t;
+		len -= t;
+	}
+	/* Process data in 64-byte chunks */
+
+	while (len >= 64) {
+		memcpy(ctx->in, buf, 64);
+		byteReverse(ctx->in, 16);
+		MD5_Transform(ctx->buf, (uint32 *) ctx->in);
+		buf += 64;
+		len -= 64;
+	}
+
+	/* Handle any remaining bytes of data. */
+
+	memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+void MD5_Final(unsigned char digest[16], struct MD5Context *ctx)
+{
+	unsigned count;
+	unsigned char *p;
+
+	/* Compute number of bytes mod 64 */
+	count = (ctx->bits[0] >> 3) & 0x3F;
+
+	/* Set the first char of padding to 0x80.  This is safe since there is
+	   always at least one byte free */
+	p = ctx->in + count;
+	*p++ = 0x80;
+
+	/* Bytes of padding needed to make 64 bytes */
+	count = 64 - 1 - count;
+
+	/* Pad out to 56 mod 64 */
+	if (count < 8) {
+		/* Two lots of padding:  Pad the first block to 64 bytes */
+		memset(p, 0, count);
+		byteReverse(ctx->in, 16);
+		MD5_Transform(ctx->buf, (uint32 *) ctx->in);
+
+		/* Now fill the next block with 56 bytes */
+		memset(ctx->in, 0, 56);
+	} else {
+		/* Pad block to 56 bytes */
+		memset(p, 0, count - 8);
+	}
+	byteReverse(ctx->in, 14);
+
+	/* Append length in bits and transform */
+	((uint32 *) ctx->in)[14] = ctx->bits[0];
+	((uint32 *) ctx->in)[15] = ctx->bits[1];
+
+	MD5_Transform(ctx->buf, (uint32 *) ctx->in);
+	byteReverse((unsigned char *) ctx->buf, 4);
+	memcpy(digest, ctx->buf, 16);
+	memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+}
+
+#ifndef ASM_MD5
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+void MD5_Transform(uint32 buf[4], uint32 const in[16])
+{
+	register uint32 a, b, c, d;
+
+	a = buf[0];
+	b = buf[1];
+	c = buf[2];
+	d = buf[3];
+
+	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478U, 7);
+	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756U, 12);
+	MD5STEP(F1, c, d, a, b, in[2] + 0x242070dbU, 17);
+	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceeeU, 22);
+	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0fafU, 7);
+	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62aU, 12);
+	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613U, 17);
+	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501U, 22);
+	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8U, 7);
+	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7afU, 12);
+	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1U, 17);
+	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7beU, 22);
+	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122U, 7);
+	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193U, 12);
+	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438eU, 17);
+	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821U, 22);
+
+	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562U, 5);
+	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340U, 9);
+	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51U, 14);
+	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aaU, 20);
+	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105dU, 5);
+	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453U, 9);
+	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681U, 14);
+	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8U, 20);
+	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6U, 5);
+	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6U, 9);
+	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87U, 14);
+	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14edU, 20);
+	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905U, 5);
+	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8U, 9);
+	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9U, 14);
+	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8aU, 20);
+
+	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942U, 4);
+	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681U, 11);
+	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122U, 16);
+	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380cU, 23);
+	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44U, 4);
+	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9U, 11);
+	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60U, 16);
+	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70U, 23);
+	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6U, 4);
+	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127faU, 11);
+	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085U, 16);
+	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05U, 23);
+	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039U, 4);
+	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5U, 11);
+	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8U, 16);
+	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665U, 23);
+
+	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244U, 6);
+	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97U, 10);
+	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7U, 15);
+	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039U, 21);
+	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3U, 6);
+	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92U, 10);
+	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47dU, 15);
+	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1U, 21);
+	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4fU, 6);
+	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0U, 10);
+	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314U, 15);
+	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1U, 21);
+	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82U, 6);
+	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235U, 10);
+	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bbU, 15);
+	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391U, 21);
+
+	buf[0] += a;
+	buf[1] += b;
+	buf[2] += c;
+	buf[3] += d;
+}
+
+#endif
diff --git a/utils/md5.h b/utils/md5.h
new file mode 100644
index 000000000..bacfb534a
--- /dev/null
+++ b/utils/md5.h
@@ -0,0 +1,25 @@
+
+#ifndef MD5_H
+#define MD5_H
+
+#include <sys/types.h>
+
+typedef u_int32_t uint32;
+
+struct MD5Context {
+	uint32 buf[4];
+	uint32 bits[2];
+	unsigned char in[64];
+};
+
+void MD5_Init(struct MD5Context *);
+void MD5_Update(struct MD5Context *, unsigned const char *, unsigned);
+void MD5_Final(unsigned char digest[16], struct MD5Context *);
+
+/*
+ * This is needed to make RSAREF happy on some MS-DOS compilers.
+ */
+
+typedef struct MD5Context MD5_CTX;
+
+#endif				/* MD5_H */