merge from lp:~mvo/apt/mvo

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 9447e995657648ca69809b3552dbf02776bc23c4..e76428325fab5f90d1c5caba08886a6cde9637bd 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -23,55 +23,33 @@
 #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 <algorithm>

+#include <stdint.h>

 
 using std::string;
 using std::min;
 
 
 using std::string;
 using std::min;
 

-class MD5Summation;
+#include "hashsum_template.h"

 
 

-class MD5SumValue
-{
-   friend class MD5Summation;
-   unsigned char Sum[4*4];
-   
-   public:
-
-   // Accessors
-   bool operator ==(const MD5SumValue &rhs) const; 
-   string Value() const;
-   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);
-   inline void Set(unsigned char S[16]) 
-         {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];};
-
-   MD5SumValue(string Str);
-   MD5SumValue();
-};
+typedef HashSumValue<128> MD5SumValue;

 
 

-class MD5Summation
+class MD5Summation : public SummationImplementation

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

-   
+

    public:
 
    public:
 

-   bool Add(const unsigned char *Data,unsigned long Size);
-   inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
-   bool AddFD(int Fd,unsigned long Size);
-   inline bool Add(const unsigned char *Beg,const unsigned char *End) 
-                  {return Add(Beg,End-Beg);};
+   bool Add(const unsigned char *inbuf, unsigned long inlen);
+   using SummationImplementation::Add;
+

    MD5SumValue Result();
    MD5SumValue Result();

-   
+

    MD5Summation();
 };
 
    MD5Summation();
 };