X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/312e87daabe8afe71c938d6e7f141aa9c5e6a938..bb3a5465800b93a7eba89ff663f5b7a1cecb1056:/apt-pkg/contrib/md5.cc diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index ec8228c2b..1e2ab3656 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.8 1999/11/16 01:41:49 jgg Exp $ +// $Id: md5.cc,v 1.11 1999/12/10 23:40:29 jgg Exp $ /* ###################################################################### MD5Sum - MD5 Message Digest Algorithm. @@ -43,18 +43,18 @@ #include #include -#include #include #include // For htonl #include #include +#include /*}}}*/ // 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; @@ -269,7 +269,7 @@ bool MD5Summation::Add(const unsigned char *data,unsigned long len) // First chunk is an odd size memcpy((unsigned char *)in + 64 - t,data,t); - byteSwap((uint8_t *)in, 16); + byteSwap(in, 16); MD5Transform(buf,in); data += t; len -= t; @@ -278,7 +278,7 @@ bool MD5Summation::Add(const unsigned char *data,unsigned long len) while (len >= 64) { memcpy(in,data,64); - byteSwap((uint8_t *)in,16); + byteSwap(in,16); MD5Transform(buf,in); data += 64; len -= 64; @@ -334,20 +334,20 @@ MD5SumValue MD5Summation::Result() if (count < 0) { memset(p,0,count + 8); - byteSwap((uint8_t *)in, 16); + byteSwap(in, 16); MD5Transform(buf,in); p = (unsigned char *)in; count = 56; } memset(p, 0, count); - byteSwap((unit8_t *)in, 14); + byteSwap(in, 14); // Append length in bits and transform in[14] = bytes[0] << 3; in[15] = bytes[1] << 3 | bytes[0] >> 29; MD5Transform(buf,in); - byteSwap((uint8_t *)buf,4); + byteSwap(buf,4); Done = true; }