* cmdline/apt-get.cc

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 84863f7c085abfd483a4729ee0a302d142d76e48..96c8975b46f6cc165b257f889bd1bb2f56ac5168 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.2 1998/11/25 23:54:45 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


@@ -21,17 +23,20 @@
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 

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

 
 #include <string>
 
 #include <string>

+#include <cstring>
+#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:


@@ -39,16 +44,20 @@ class MD5SumValue
    // Accessors
    bool operator ==(const MD5SumValue &rhs) const; 
    string Value() const;
    // Accessors
    bool operator ==(const MD5SumValue &rhs) const; 
    string Value() const;

-   inline operator string() const {return Value();}; 
+   inline void Value(unsigned char S[16]) 
+         {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];};
+   inline operator string() const {return Value();};

    bool Set(string Str);
    bool Set(string Str);

-   
+   inline void Set(unsigned char S[16]) 
+         {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];};
+

    MD5SumValue(string Str);
    MD5SumValue();
 };
 
 class MD5Summation
 {
    MD5SumValue(string Str);
    MD5SumValue();
 };
 
 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;