X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/59257a2194aa56dc0bb6d7bd150c8bfc67b5b53a..4d165fe0b5974454f706d42e7bb9e8424fe7fe64:/apt-pkg/contrib/md5.cc diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index 962d22066..fded5c864 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -1,6 +1,6 @@ // -*- 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. @@ -43,17 +43,18 @@ #include <apt-pkg/strutl.h> #include <string.h> -#include <system.h> #include <unistd.h> #include <netinet/in.h> // For htonl #include <inttypes.h> +#include <config.h> +#include <system.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; @@ -190,7 +191,7 @@ MD5SumValue::MD5SumValue() /* 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 /*{{{*/ @@ -298,8 +299,8 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size) int Res = 0; while (Size != 0) { - Res = read(Fd,Buf,MIN(Size,sizeof(Buf))); - if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf))) + Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf))); + if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf))) return false; Size -= Res; Add(Buf,Res);