* merged from apt--mvo

[apt.git] / apt-pkg / contrib / md5.cc

diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index e656f3221eebba33d7a0988dd537fcb6deb61dac..44242371a3201a0754e7d7d3b42abd9966fd1e52 100644 (file)
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: md5.cc,v 1.4 1999/10/25 03:36:41 jgg Exp $
+// $Id: md5.cc,v 1.12 2001/05/13 05:15:03 jgg Exp $

 /* ######################################################################
    
    MD5Sum - MD5 Message Digest Algorithm.
 /* ######################################################################
    
    MD5Sum - MD5 Message Digest Algorithm.


@@ -28,33 +28,31 @@
    Still in the public domain.
 
    The classes use arrays of char that are a specific size. We cast those
    Still in the public domain.
 
    The classes use arrays of char that are a specific size. We cast those

-   arrays to UINT32's and go from there. This allows us to advoid using
-   config.h in a public header or internally newing memory. 
+   arrays to uint8_t's and go from there. This allows us to advoid using
+   the uncommon inttypes.h in a public header or internally newing memory.
+   In theory if C9x becomes nicely accepted

    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/md5.h"
-#endif
-

 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
 
 #include <string.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
 
 #include <string.h>

-#include <system.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <config.h>
+#include <netinet/in.h>                          // For htonl

 #include <inttypes.h>
 #include <inttypes.h>

+#include <config.h>
+#include <system.h>

                                                                        /*}}}*/
 
 // byteSwap - Swap bytes in a buffer                                   /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 
 // byteSwap - Swap bytes in a buffer                                   /*{{{*/
 // ---------------------------------------------------------------------

-/* This byteswap function will swap byte in a buffer of data */
+/* Swap n 32 bit longs in given buffer */

 #ifdef WORDS_BIGENDIAN
 static void byteSwap(uint32_t *buf, unsigned words)
 {
 #ifdef WORDS_BIGENDIAN
 static void byteSwap(uint32_t *buf, unsigned words)
 {

-   unsigned char *p = (unsigned char *)buf;
+   uint8_t *p = (uint8_t *)buf;

    
    do 
    {
    
    do 
    {


@@ -189,7 +187,7 @@ MD5SumValue::MD5SumValue()
 /* Converts the hex string into a set of chars */
 bool MD5SumValue::Set(string Str)
 {
 /* 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               /*{{{*/
 }
                                                                        /*}}}*/
 // MD5SumValue::Value - Convert the number into a string               /*{{{*/


@@ -297,8 +295,8 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size)
    int Res = 0;
    while (Size != 0)
    {
    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);
         return false;
       Size -= Res;
       Add(Buf,Res);