Merge remote-tracking branch 'mvo/bugfix/update-progress-reporting' into debian/exper...

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

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 0c0b6c6a725869844cde0f73d196e47cb6985d4d..7a62f8a8fc687698a0e9c675e3adad94c03a68a4 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -17,17 +17,22 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>

-#include <apt-pkg/fileutl.h>

 
 

-#include <algorithm>
-#include <vector>

 #include <cstring>
 #include <cstring>

-
+#include <string>

 
 #ifndef APT_8_CLEANER_HEADERS
 using std::min;
 using std::vector;
 #endif
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::min;
 using std::vector;
 #endif

+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#include <algorithm>
+#include <vector>
+#endif
+
+
+class FileFd;

 
 // helper class that contains hash function name
 // and hash
 
 // helper class that contains hash function name
 // and hash


@@ -36,7 +41,10 @@ class HashString
  protected:
    std::string Type;
    std::string Hash;
  protected:
    std::string Type;
    std::string Hash;

-   static const char * _SupportedHashes[10];
+   static const char* _SupportedHashes[10];
+
+   // internal helper
+   std::string GetHashForFile(std::string filename) const;

 
  public:
    HashString(std::string Type, std::string Hash);
 
  public:
    HashString(std::string Type, std::string Hash);


@@ -49,12 +57,16 @@ class HashString
    // verify the given filename against the currently loaded hash
    bool VerifyFile(std::string filename) const;
 
    // verify the given filename against the currently loaded hash
    bool VerifyFile(std::string filename) const;
 

+   // generate a hash string from the given filename
+   bool FromFile(std::string filename);
+
+

    // helper
    std::string toStr() const;                    // convert to str as "type:hash"
    bool empty() const;
 
    // return the list of hashes we support
    // helper
    std::string toStr() const;                    // convert to str as "type:hash"
    bool empty() const;
 
    // return the list of hashes we support

-   static const char** SupportedHashes();
+   static APT_CONST const char** SupportedHashes();

 };
 
 class Hashes
 };
 
 class Hashes


@@ -66,11 +78,13 @@ class Hashes
    SHA256Summation SHA256;
    SHA512Summation SHA512;
    
    SHA256Summation SHA256;
    SHA512Summation SHA512;
    

+   static const int UntilEOF = 0;
+

    inline bool Add(const unsigned char *Data,unsigned long long Size)
    {
       return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
    };
    inline bool Add(const unsigned char *Data,unsigned long long Size)
    {
       return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
    };

-   inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
+   inline bool Add(const char *Data) {return Add((unsigned char const *)Data,strlen(Data));};

    inline bool AddFD(int const Fd,unsigned long long Size = 0)
    { return AddFD(Fd, Size, true, true, true, true); };
    bool AddFD(int const Fd, unsigned long long Size, bool const addMD5,
    inline bool AddFD(int const Fd,unsigned long long Size = 0)
    { return AddFD(Fd, Size, true, true, true, true); };
    bool AddFD(int const Fd, unsigned long long Size, bool const addMD5,