test framework: Correctly generate new paths in noopchroot

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 9cc88cfbe6811b7adfc484cb99c260eea712b027..a16ea4d2d673dd09a73a567b2478b669548552ab 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -10,7 +10,7 @@
    store a MD5Sum in 16 bytes of memory.
    
    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.
+   block of data. This can be used to guard against corruption of a file.
    MD5 should not be used for tamper protection, use SHA or something more
    secure.
    
@@ -23,37 +23,36 @@
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 
+#include <stdint.h>
+
+#include "hashsum_template.h"
 
+#ifndef APT_10_CLEANER_HEADERS
 #include <string>
 #include <cstring>
 #include <algorithm>
-#include <stdint.h>
-
+#endif
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
-
-#include "hashsum_template.h"
-
-class MD5Summation;
+#endif
 
 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;
-   
+
    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) APT_OVERRIDE;
+   using SummationImplementation::Add;
+
    MD5SumValue Result();
-   
+
    MD5Summation();
 };