* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 9cfa6ae7286bf68e2f21208f1fc58b10fee0bab8..e280d714e8ad8302ea6214421bc23514776db6eb 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: md5.h,v 1.3 1999/01/18 06:20:08 jgg Exp $
+// $Id: md5.h,v 1.6 2001/05/07 05:06:52 jgg Exp $

 /* ######################################################################
    
    MD5SumValue - Storage for a MD5Sum
 /* ######################################################################
    
    MD5SumValue - Storage for a MD5Sum


@@ -11,6 +11,8 @@
    
    A MD5Sum is used to generate a (hopefully) unique 16 byte number for a
    block of data. This can be used to gaurd against corruption of a file.
    
    A MD5Sum is used to generate a (hopefully) unique 16 byte number for a
    block of data. This can be used to gaurd against corruption of a file.

+   MD5 should not be used for tamper protection, use SHA or something more
+   secure.

    
    There are two classes because computing a MD5 is not a continual 
    operation unless 64 byte blocks are used. Also the summation requires an
    
    There are two classes because computing a MD5 is not a continual 
    operation unless 64 byte blocks are used. Also the summation requires an


@@ -26,12 +28,17 @@
 #endif 
 
 #include <string>
 #endif 
 
 #include <string>

+#include <algorithm>
+#include <stdint.h>
+
+using std::string;
+using std::min;

 
 class MD5Summation;
 
 class MD5SumValue
 {
 
 class MD5Summation;
 
 class MD5SumValue
 {

-   friend MD5Summation;
+   friend class MD5Summation;

    unsigned char Sum[4*4];
    
    public:
    unsigned char Sum[4*4];
    
    public:


@@ -52,7 +59,7 @@ class MD5SumValue
 
 class MD5Summation
 {
 
 class MD5Summation
 {

-   unsigned char Buf[4*4];
+   uint32_t Buf[4];

    unsigned char Bytes[2*4];
    unsigned char In[16*4];
    bool Done;
    unsigned char Bytes[2*4];
    unsigned char In[16*4];
    bool Done;