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

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 9cc88cfbe6811b7adfc484cb99c260eea712b027..25631b1668058749ba0dc7e93e729e055f3e6ea1 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -29,31 +29,29 @@
 #include <algorithm>
 #include <stdint.h>
 
 #include <algorithm>
 #include <stdint.h>
 

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

 #include "hashsum_template.h"
 
 #include "hashsum_template.h"
 

-class MD5Summation;
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::min;
+#endif

 
 typedef HashSumValue<128> 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 long inlen);
+   using SummationImplementation::Add;
+

    MD5SumValue Result();
    MD5SumValue Result();

-   
+

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