merged lp:~donkult/apt/experimental

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

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index fcc2f887cb704b825f18ced40959f952e6e4e084..05001f042102a3bdb4f1f645b7a73f9e1614fe4d 100644 (file)
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -11,70 +11,76 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

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

-    
-#include <unistd.h>    
-#include <system.h>    
+#include <apt-pkg/macros.h>
+
+#include <unistd.h>

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

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

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

-HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
+HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Hash)

 {
 }
 
 {
 }
 

-HashString::HashString(string StringedHash)
+HashString::HashString(std::string StringedHash)                       /*{{{*/

 {
    // legacy: md5sum without "MD5Sum:" prefix
 {
    // legacy: md5sum without "MD5Sum:" prefix

-   if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
+   if (StringedHash.find(":") == std::string::npos && StringedHash.size() == 32)

    {
       Type = "MD5Sum";
       Hash = StringedHash;
       return;
    }
    {
       Type = "MD5Sum";
       Hash = StringedHash;
       return;
    }

-   string::size_type pos = StringedHash.find(":");
+   std::string::size_type pos = StringedHash.find(":");

    Type = StringedHash.substr(0,pos);
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 
    if(_config->FindB("Debug::Hashes",false) == true)
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
    Type = StringedHash.substr(0,pos);
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 
    if(_config->FindB("Debug::Hashes",false) == true)
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }

-
-
-bool HashString::VerifyFile(string filename) const
+                                                                       /*}}}*/
+bool HashString::VerifyFile(std::string filename) const                        /*{{{*/

 {
 {

-   FileFd fd;
-   MD5Summation MD5;
-   SHA1Summation SHA1;
-   SHA256Summation SHA256;
-   string fileHash;
+   std::string fileHash;

 
    FileFd Fd(filename, FileFd::ReadOnly);
 
    FileFd Fd(filename, FileFd::ReadOnly);

-   if(Type == "MD5Sum") 
+   if(Type == "MD5Sum")

    {
    {

+      MD5Summation MD5;

       MD5.AddFD(Fd.Fd(), Fd.Size());
       MD5.AddFD(Fd.Fd(), Fd.Size());

-      fileHash = (string)MD5.Result();
-   } 
+      fileHash = (std::string)MD5.Result();
+   }

    else if (Type == "SHA1")
    {
    else if (Type == "SHA1")
    {

+      SHA1Summation SHA1;

       SHA1.AddFD(Fd.Fd(), Fd.Size());
       SHA1.AddFD(Fd.Fd(), Fd.Size());

-      fileHash = (string)SHA1.Result();
-   } 
-   else if (Type == "SHA256") 
+      fileHash = (std::string)SHA1.Result();
+   }
+   else if (Type == "SHA256")

    {
    {

+      SHA256Summation SHA256;

       SHA256.AddFD(Fd.Fd(), Fd.Size());
       SHA256.AddFD(Fd.Fd(), Fd.Size());

-      fileHash = (string)SHA256.Result();
+      fileHash = (std::string)SHA256.Result();
+   }
+   else if (Type == "SHA512")
+   {
+      SHA512Summation SHA512;
+      SHA512.AddFD(Fd.Fd(), Fd.Size());
+      fileHash = (std::string)SHA512.Result();

    }
    Fd.Close();
 
    }
    Fd.Close();
 


@@ -83,7 +89,7 @@ bool HashString::VerifyFile(string filename) const
 
    return (fileHash == Hash);
 }
 
    return (fileHash == Hash);
 }

-
+                                                                       /*}}}*/

 const char** HashString::SupportedHashes()
 {
    return _SupportedHashes;
 const char** HashString::SupportedHashes()
 {
    return _SupportedHashes;


@@ -94,29 +100,38 @@ bool HashString::empty() const
    return (Type.empty() || Hash.empty());
 }
 
    return (Type.empty() || Hash.empty());
 }
 

-
-string HashString::toStr() const
+std::string HashString::toStr() const

 {
 {

-   return Type+string(":")+Hash;
+   return Type + std::string(":") + Hash;

 }
 
 }
 

-

 // Hashes::AddFD - Add the contents of the FD                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Hashes::AddFD - Add the contents of the FD                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Hashes::AddFD(int Fd,unsigned long Size)
+bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5,
+                  bool const addSHA1, bool const addSHA256, bool const addSHA512)

 {
    unsigned char Buf[64*64];
 {
    unsigned char Buf[64*64];

-   int Res = 0;
-   while (Size != 0)
+   ssize_t Res = 0;
+   int ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)

    {
    {

-      Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
-      if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
+      Res = read(Fd,Buf,n);
+      if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read

         return false;
         return false;

+      if (ToEOF && Res == 0) // EOF
+        break;

       Size -= Res;
       Size -= Res;

-      MD5.Add(Buf,Res);
-      SHA1.Add(Buf,Res);
-      SHA256.Add(Buf,Res);
+      if (addMD5 == true)
+        MD5.Add(Buf,Res);
+      if (addSHA1 == true)
+        SHA1.Add(Buf,Res);
+      if (addSHA256 == true)
+        SHA256.Add(Buf,Res);
+      if (addSHA512 == true)
+        SHA512.Add(Buf,Res);

    }
    return true;
 }
    }
    return true;
 }