- provide a {Package,Version}List similar to {Package,Version}Set

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

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 40bbe00a02673edae48a0cd23f78cd018435de26..81851dedeb2d3b0f47c6de3a9f06ccedf24394c4 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -13,16 +13,42 @@
 #ifndef APTPKG_HASHES_H
 #define APTPKG_HASHES_H
 
 #ifndef APTPKG_HASHES_H
 #define APTPKG_HASHES_H
 

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

 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>

+#include <apt-pkg/sha2.h>

 
 #include <algorithm>
 
 #include <algorithm>

+#include <vector>
+#include <cstring>

 
 

-using std::min;
+// helper class that contains hash function name
+// and hash
+class HashString
+{
+ protected:
+   std::string Type;
+   std::string Hash;
+   static const char * _SupportedHashes[10];
+
+ public:
+   HashString(std::string Type, std::string Hash);
+   HashString(std::string StringedHashString);  // init from str as "type:hash"
+   HashString();
+
+   // get hash type used
+   std::string HashType() { return Type; };
+
+   // verify the given filename against the currently loaded hash
+   bool VerifyFile(std::string filename) const;
+
+   // 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();
+};

 
 class Hashes
 {
 
 class Hashes
 {


@@ -30,13 +56,18 @@ class Hashes
 
    MD5Summation MD5;
    SHA1Summation SHA1;
 
    MD5Summation MD5;
    SHA1Summation SHA1;

+   SHA256Summation SHA256;
+   SHA512Summation SHA512;

    
    

-   inline bool Add(const unsigned char *Data,unsigned long Size)
+   inline bool Add(const unsigned char *Data,unsigned long long Size)

    {
    {

-      return MD5.Add(Data,Size) && SHA1.Add(Data,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 *)Data,strlen(Data));};

-   bool AddFD(int Fd,unsigned long Size);
+   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,
+             bool const addSHA1, bool const addSHA256, bool const addSHA512);

    inline bool Add(const unsigned char *Beg,const unsigned char *End) 
                   {return Add(Beg,End-Beg);};
 };
    inline bool Add(const unsigned char *Beg,const unsigned char *End) 
                   {return Add(Beg,End-Beg);};
 };