// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: md5.cc,v 1.7 1999/11/14 01:47:55 jgg Exp $
+// $Id: md5.cc,v 1.12 2001/05/13 05:15:03 jgg Exp $
/* ######################################################################
MD5Sum - MD5 Message Digest Algorithm.
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/md5.h"
-#endif
-
#include <apt-pkg/md5.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
#include <string.h>
-#include <system.h>
#include <unistd.h>
#include <netinet/in.h> // For htonl
#include <inttypes.h>
+#include <config.h>
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
// ---------------------------------------------------------------------
/* Swap n 32 bit longs in given buffer */
#ifdef WORDS_BIGENDIAN
-static void byteSwap(uint8_t *buf, unsigned words)
+static void byteSwap(uint32_t *buf, unsigned words)
{
uint8_t *p = (uint8_t *)buf;
/* Converts the hex string into a set of chars */
bool MD5SumValue::Set(string Str)
{
- return Hex2Num(Str.begin(),Str.end(),Sum,sizeof(Sum));
+ return Hex2Num(Str,Sum,sizeof(Sum));
}
/*}}}*/
// MD5SumValue::Value - Convert the number into a string /*{{{*/
{
unsigned char Buf[64*64];
int Res = 0;
- while (Size != 0)
+ int ToEOF = (Size == 0);
+ while (Size != 0 || ToEOF)
{
- Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
- if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
- return false;
+ unsigned n = sizeof(Buf);
+ if (!ToEOF) n = min(Size,(unsigned long)n);
+ Res = read(Fd,Buf,n);
+ if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+ return false;
+ if (ToEOF && Res == 0) // EOF
+ break;
Size -= Res;
Add(Buf,Res);
}