Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

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

diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 6c60ffd743a69bfad91b7ce66031be367e34a831..b487a96f9bb30ca289be03f6f0f073b7e6f542f5 100644 (file)
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -35,15 +35,12 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

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

-#include <apt-pkg/strutl.h>
-#include <apt-pkg/macros.h>

 
 

+#include <stdint.h>

 #include <string.h>
 #include <string.h>

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

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


@@ -186,7 +183,7 @@ MD5Summation::MD5Summation()
 // MD5Summation::Add - 'Add' a data set to the hash                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // MD5Summation::Add - 'Add' a data set to the hash                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool MD5Summation::Add(const unsigned char *data,unsigned long len)
+bool MD5Summation::Add(const unsigned char *data,unsigned long long len)

 {
    if (Done == true)
       return false;
 {
    if (Done == true)
       return false;


@@ -231,29 +228,6 @@ bool MD5Summation::Add(const unsigned char *data,unsigned long len)
    return true;   
 }
                                                                        /*}}}*/
    return true;   
 }
                                                                        /*}}}*/

-// MD5Summation::AddFD - Add the contents of a FD to the hash          /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool MD5Summation::AddFD(int Fd,unsigned long Size)
-{
-   unsigned char Buf[64*64];
-   int Res = 0;
-   int ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF)
-   {
-      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);
-   }
-   return true;
-}
-                                                                       /*}}}*/

 // MD5Summation::Result - Returns the value of the sum                 /*{{{*/
 // ---------------------------------------------------------------------
 /* Because this must add in the last bytes of the series it prevents anyone
 // MD5Summation::Result - Returns the value of the sum                 /*{{{*/
 // ---------------------------------------------------------------------
 /* Because this must add in the last bytes of the series it prevents anyone


@@ -298,7 +272,7 @@ MD5SumValue MD5Summation::Result()
    }
    
    MD5SumValue V;
    }
    
    MD5SumValue V;

-   V.Set((char *)buf);
+   V.Set((unsigned char *)buf);

    return V;
 }
                                                                        /*}}}*/
    return V;
 }
                                                                        /*}}}*/