make all d-pointer * const pointers

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

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 417982343c68b9945436e78c575a67c3db957696..4481321c4e0aad9ff83ae1ec59d0ec6bb07d0b0e 100644 (file)
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -23,13 +23,14 @@
 #include <stddef.h>
 #include <algorithm>
 #include <unistd.h>
 #include <stddef.h>
 #include <algorithm>
 #include <unistd.h>

+#include <stdlib.h>

 #include <string>
 #include <iostream>
                                                                        /*}}}*/
 
 const char * HashString::_SupportedHashes[] =
 {
 #include <string>
 #include <iostream>
                                                                        /*}}}*/
 
 const char * HashString::_SupportedHashes[] =
 {

-   "SHA512", "SHA256", "SHA1", "MD5Sum", NULL
+   "SHA512", "SHA256", "SHA1", "MD5Sum", "Checksum-FileSize", NULL

 };
 
 HashString::HashString()
 };
 
 HashString::HashString()


@@ -111,6 +112,8 @@ std::string HashString::GetHashForFile(std::string filename) const      /*{{{*/
       SHA512.AddFD(Fd);
       fileHash = (std::string)SHA512.Result();
    }
       SHA512.AddFD(Fd);
       fileHash = (std::string)SHA512.Result();
    }

+   else if (strcasecmp(Type.c_str(), "Checksum-FileSize") == 0)
+      strprintf(fileHash, "%llu", Fd.FileSize());

    Fd.Close();
 
    return fileHash;
    Fd.Close();
 
    return fileHash;


@@ -147,7 +150,13 @@ bool HashStringList::usable() const                                        /*{{{*/
       return false;
    std::string const forcedType = _config->Find("Acquire::ForceHash", "");
    if (forcedType.empty() == true)
       return false;
    std::string const forcedType = _config->Find("Acquire::ForceHash", "");
    if (forcedType.empty() == true)

-      return true;
+   {
+      // FileSize alone isn't usable
+      for (std::vector<HashString>::const_iterator hs = list.begin(); hs != list.end(); ++hs)
+        if (hs->HashType() != "Checksum-FileSize")
+           return true;
+      return false;
+   }

    return find(forcedType) != NULL;
 }
                                                                        /*}}}*/
    return find(forcedType) != NULL;
 }
                                                                        /*}}}*/


@@ -170,6 +179,22 @@ HashString const * HashStringList::find(char const * const type) const /*{{{*/
    return NULL;
 }
                                                                        /*}}}*/
    return NULL;
 }
                                                                        /*}}}*/

+unsigned long long HashStringList::FileSize() const                    /*{{{*/
+{
+   HashString const * const hsf = find("Checksum-FileSize");
+   if (hsf == NULL)
+      return 0;
+   std::string const hv = hsf->HashValue();
+   return strtoull(hv.c_str(), NULL, 10);
+}
+                                                                       /*}}}*/
+bool HashStringList::FileSize(unsigned long long const Size)           /*{{{*/
+{
+   std::string size;
+   strprintf(size, "%llu", Size);
+   return push_back(HashString("Checksum-FileSize", size));
+}
+                                                                       /*}}}*/

 bool HashStringList::supported(char const * const type)                        /*{{{*/
 {
    for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t)
 bool HashStringList::supported(char const * const type)                        /*{{{*/
 {
    for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t)


@@ -196,12 +221,22 @@ bool HashStringList::push_back(const HashString &hashString)              /*{{{*/
                                                                        /*}}}*/
 bool HashStringList::VerifyFile(std::string filename) const            /*{{{*/
 {
                                                                        /*}}}*/
 bool HashStringList::VerifyFile(std::string filename) const            /*{{{*/
 {

-   if (list.empty() == true)
-      return false;
-   HashString const * const hs = find(NULL);
-   if (hs == NULL || hs->VerifyFile(filename) == false)
+   if (usable() == false)

       return false;
       return false;

-   return true;
+
+   Hashes hashes(*this);
+   FileFd file(filename, FileFd::ReadOnly);
+   HashString const * const hsf = find("Checksum-FileSize");
+   if (hsf != NULL)
+   {
+      std::string fileSize;
+      strprintf(fileSize, "%llu", file.FileSize());
+      if (hsf->HashValue() != fileSize)
+        return false;
+   }
+   hashes.AddFD(file);
+   HashStringList const hsl = hashes.GetHashStringList();
+   return hsl == *this;

 }
                                                                        /*}}}*/
 bool HashStringList::operator==(HashStringList const &other) const     /*{{{*/
 }
                                                                        /*}}}*/
 bool HashStringList::operator==(HashStringList const &other) const     /*{{{*/


@@ -235,28 +270,50 @@ bool HashStringList::operator!=(HashStringList const &other) const
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+// PrivateHashes                                                       /*{{{*/
+class PrivateHashes {
+public:
+   unsigned long long FileSize;
+   unsigned int CalcHashes;
+
+   explicit PrivateHashes(unsigned int const CalcHashes) : FileSize(0), CalcHashes(CalcHashes) {}
+   explicit PrivateHashes(HashStringList const &Hashes) : FileSize(0) {
+      unsigned int calcHashes = Hashes.usable() ? 0 : ~0;
+      if (Hashes.find("MD5Sum") != NULL)
+        calcHashes |= Hashes::MD5SUM;
+      if (Hashes.find("SHA1") != NULL)
+        calcHashes |= Hashes::SHA1SUM;
+      if (Hashes.find("SHA256") != NULL)
+        calcHashes |= Hashes::SHA256SUM;
+      if (Hashes.find("SHA512") != NULL)
+        calcHashes |= Hashes::SHA512SUM;
+      CalcHashes = calcHashes;
+   }
+};
+                                                                       /*}}}*/

 // Hashes::Add* - Add the contents of data or FD                       /*{{{*/
 // Hashes::Add* - Add the contents of data or FD                       /*{{{*/

-bool Hashes::Add(const unsigned char * const Data,unsigned long long const Size, unsigned int const Hashes)
+bool Hashes::Add(const unsigned char * const Data, unsigned long long const Size)

 {
    bool Res = true;
 {
    bool Res = true;

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic push
-       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-   if ((Hashes & MD5SUM) == MD5SUM)
+APT_IGNORE_DEPRECATED_PUSH
+   if ((d->CalcHashes & MD5SUM) == MD5SUM)

       Res &= MD5.Add(Data, Size);
       Res &= MD5.Add(Data, Size);

-   if ((Hashes & SHA1SUM) == SHA1SUM)
+   if ((d->CalcHashes & SHA1SUM) == SHA1SUM)

       Res &= SHA1.Add(Data, Size);
       Res &= SHA1.Add(Data, Size);

-   if ((Hashes & SHA256SUM) == SHA256SUM)
+   if ((d->CalcHashes & SHA256SUM) == SHA256SUM)

       Res &= SHA256.Add(Data, Size);
       Res &= SHA256.Add(Data, Size);

-   if ((Hashes & SHA512SUM) == SHA512SUM)
+   if ((d->CalcHashes & SHA512SUM) == SHA512SUM)

       Res &= SHA512.Add(Data, Size);
       Res &= SHA512.Add(Data, Size);

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
+   d->FileSize += Size;

    return Res;
 }
    return Res;
 }

-bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hashes)
+bool Hashes::Add(const unsigned char * const Data, unsigned long long const Size, unsigned int const Hashes)
+{
+   d->CalcHashes = Hashes;
+   return Add(Data, Size);
+}
+bool Hashes::AddFD(int const Fd,unsigned long long Size)

 {
    unsigned char Buf[64*64];
    bool const ToEOF = (Size == UntilEOF);
 {
    unsigned char Buf[64*64];
    bool const ToEOF = (Size == UntilEOF);


@@ -270,12 +327,17 @@ bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hash
       if (ToEOF && Res == 0) // EOF
         break;
       Size -= Res;
       if (ToEOF && Res == 0) // EOF
         break;
       Size -= Res;

-      if (Add(Buf, Res, Hashes) == false)
+      if (Add(Buf, Res) == false)

         return false;
    }
    return true;
 }
         return false;
    }
    return true;
 }

-bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes)
+bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hashes)
+{
+   d->CalcHashes = Hashes;
+   return AddFD(Fd, Size);
+}
+bool Hashes::AddFD(FileFd &Fd,unsigned long long Size)

 {
    unsigned char Buf[64*64];
    bool const ToEOF = (Size == 0);
 {
    unsigned char Buf[64*64];
    bool const ToEOF = (Size == 0);


@@ -294,35 +356,36 @@ bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes
       else if (a == 0) // EOF
         break;
       Size -= a;
       else if (a == 0) // EOF
         break;
       Size -= a;

-      if (Add(Buf, a, Hashes) == false)
+      if (Add(Buf, a) == false)

         return false;
    }
    return true;
         return false;
    }
    return true;

+}
+bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes)
+{
+   d->CalcHashes = Hashes;
+   return AddFD(Fd, Size);

 }
                                                                        /*}}}*/
 HashStringList Hashes::GetHashStringList()
 {
    HashStringList hashes;
 }
                                                                        /*}}}*/
 HashStringList Hashes::GetHashStringList()
 {
    HashStringList hashes;

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic push
-       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-   hashes.push_back(HashString("MD5Sum", MD5.Result().Value()));
-   hashes.push_back(HashString("SHA1", SHA1.Result().Value()));
-   hashes.push_back(HashString("SHA256", SHA256.Result().Value()));
-   hashes.push_back(HashString("SHA512", SHA512.Result().Value()));
-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_PUSH
+   if ((d->CalcHashes & MD5SUM) == MD5SUM)
+      hashes.push_back(HashString("MD5Sum", MD5.Result().Value()));
+   if ((d->CalcHashes & SHA1SUM) == SHA1SUM)
+      hashes.push_back(HashString("SHA1", SHA1.Result().Value()));
+   if ((d->CalcHashes & SHA256SUM) == SHA256SUM)
+      hashes.push_back(HashString("SHA256", SHA256.Result().Value()));
+   if ((d->CalcHashes & SHA512SUM) == SHA512SUM)
+      hashes.push_back(HashString("SHA512", SHA512.Result().Value()));
+APT_IGNORE_DEPRECATED_POP
+   hashes.FileSize(d->FileSize);

    return hashes;
 }
    return hashes;
 }

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic push
-       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-       #pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
-#endif
-Hashes::Hashes() {}
-Hashes::~Hashes() {}
-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_PUSH
+Hashes::Hashes() : d(new PrivateHashes(~0)) { }
+Hashes::Hashes(unsigned int const Hashes) : d(new PrivateHashes(Hashes)) {}
+Hashes::Hashes(HashStringList const &Hashes) : d(new PrivateHashes(Hashes)) {}
+Hashes::~Hashes() { delete d; }
+APT_IGNORE_DEPRECATED_POP