add a simple container for HashStrings

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

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index e702fcca2fd9459d2fd2e66f1b95aaf94bd764ca..5a4213868ccb52dc7d7e66e73bec0f0171d470b2 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -17,40 +17,138 @@
 #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/macros.h>

 
 

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

 #include <cstring>
 #include <cstring>

+#include <string>

 
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::min;
 using std::vector;
 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
 class HashString
 {
  protected:
 
 // helper class that contains hash function name
 // and hash
 class HashString
 {
  protected:

-   string Type;
-   string Hash;
+   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:
  public:

-   HashString(string Type, string Hash);
-   HashString(string StringedHashString);  // init from str as "type:hash"
+   HashString(std::string Type, std::string Hash);
+   HashString(std::string StringedHashString);  // init from str as "type:hash"

    HashString();
 
    // get hash type used
    HashString();
 
    // get hash type used

-   string HashType() { return Type; };
+   std::string HashType() { return Type; };
+   std::string HashType() const { return Type; };
+   std::string HashValue() const { return Hash; };

 
    // verify the given filename against the currently loaded hash
 
    // verify the given filename against the currently loaded hash

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

 
    // helper
 
    // helper

-   string toStr() const;                    // convert to str as "type:hash"
+   std::string toStr() const;                    // convert to str as "type:hash"

    bool empty() const;
    bool empty() const;

+   bool operator==(HashString const &other) const;
+   bool operator!=(HashString const &other) const;

 
    // return the list of hashes we support
 
    // return the list of hashes we support

-   static const char** SupportedHashes();
+   static APT_CONST const char** SupportedHashes();
+};
+
+class HashStringList
+{
+   public:
+   /** find best hash if no specific one is requested
+    *
+    * @param type of the checksum to return, can be \b NULL
+    * @return If type is \b NULL (or the empty string) it will
+    *  return the 'best' hash; otherwise the hash which was
+    *  specifically requested. If no hash is found \b NULL will be returned.
+    */
+   HashString const * find(char const * const type) const;
+   HashString const * find(std::string const &type) const { return find(type.c_str()); }
+   /** check if the given hash type is supported
+    *
+    * @param type to check
+    * @return true if supported, otherwise false
+    */
+   static APT_PURE bool supported(char const * const type);
+   /** add the given #HashString to the list
+    *
+    * @param hashString to add
+    * @return true if the hash is added because it is supported and
+    *  not already a different hash of the same type included, otherwise false
+    */
+   bool push_back(const HashString &hashString);
+   /** @return size of the list of HashStrings */
+   size_t size() const { return list.size(); }
+
+   /** take the 'best' hash and verify file with it
+    *
+    * @param filename to verify
+    * @return true if the file matches the hashsum, otherwise false
+    */
+   bool VerifyFile(std::string filename) const;
+
+   /** is the list empty ?
+    *
+    * @return \b true if the list is empty, otherwise \b false
+    */
+   bool empty() const { return list.empty(); }
+
+   typedef std::vector<HashString>::const_iterator const_iterator;
+
+   /** iterator to the first element */
+   const_iterator begin() const { return list.begin(); }
+
+   /** iterator to the end element */
+   const_iterator end() const { return list.end(); }
+
+   /** start fresh with a clear list */
+   void clear() { list.clear(); }
+
+   /** compare two HashStringList for similarity.
+    *
+    * Two lists are similar if at least one hashtype is in both lists
+    * and the hashsum matches. All hashes are checked, if one doesn't
+    * match false is returned regardless of how many matched before.
+    */
+   bool operator==(HashStringList const &other) const;
+   bool operator!=(HashStringList const &other) const;
+
+   HashStringList() {}
+
+   // simplifying API-compatibility constructors
+   HashStringList(std::string const &hash) {
+      if (hash.empty() == false)
+        list.push_back(HashString(hash));
+   }
+   HashStringList(char const * const hash) {
+      if (hash != NULL && hash[0] != '\0')
+        list.push_back(HashString(hash));
+   }
+
+   private:
+   std::vector<HashString> list;

 };
 
 class Hashes
 };
 
 class Hashes


@@ -62,14 +160,20 @@ class Hashes
    SHA256Summation SHA256;
    SHA512Summation SHA512;
    
    SHA256Summation SHA256;
    SHA512Summation SHA512;
    

-   inline bool Add(const unsigned char *Data,unsigned long Size)
+   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);
    };
    {
       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 AddFD(int const Fd,unsigned long Size = 0)
+   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,
+             bool const addSHA1, bool const addSHA256, bool const addSHA512);
+   inline bool AddFD(FileFd &Fd,unsigned long long Size = 0)

    { return AddFD(Fd, Size, true, true, true, true); };
    { return AddFD(Fd, Size, true, true, true, true); };

-   bool AddFD(int const Fd, unsigned long Size, bool const addMD5,
+   bool AddFD(FileFd &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);};
              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);};