* apt-pkg/acquire-item.{cc,h}:

  - rename "hash" into ExpectedHash in pkgAcqFile, pkgAcqIndex
  - add missing HashSum() call to class pkgAcqIndex
  - use the data provided by acquire-method (and send via the
    {SHA256,SHA1,MD5Sum}-Hash tag when comparing the hash, this
    avoids calculating the hash twice (just like old libapt)
* apt-pkg/acquire-method.cc:
  - send MD5Sum-Hash tag to libapt to be consistant with
    HashString::SupportedHashes()
* apt-pkg/acquire-worker.cc:
  - check with "Owner->HashSum().HashType()" what hash the frontend
    is expecting and pass it to pkgAcquireItem::Done() in the new
    HashString format
  - add some debugging output
* apt-pkg/contrib/hashes.cc:
  - fix off-by-one error when constructing a HashString from a single
    input string
* apt-pkg/contrib/hashes.h:
  - add "HashType()" method
* apt-pkg/init.h, apt-pkg/makefile, methods/makefile:
  - break ABI

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a7132ce1d20af0b4f464495096f809ddef064462..c48502bb9437c3d552ed0108b85d4b705997e439 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -641,7 +641,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
          std::cerr << "  Expected Hash: " << ExpectedHash.toStr() << std::endl;
       }
 
          std::cerr << "  Expected Hash: " << ExpectedHash.toStr() << std::endl;
       }
 

-      if (!ExpectedHash.empty() && !ExpectedHash.VerifyFile(DestFile))
+      if (!ExpectedHash.empty() && ExpectedHash.toStr() != Hash)

       {
          Status = StatAuthError;
          ErrorText = _("Hash Sum mismatch");
       {
          Status = StatAuthError;
          ErrorText = _("Hash Sum mismatch");


@@ -1296,11 +1296,11 @@ bool pkgAcqArchive::QueueNext()
       
       string PkgFile = Parse.FileName();
       if(Parse.SHA256Hash() != "")
       
       string PkgFile = Parse.FileName();
       if(Parse.SHA256Hash() != "")

-        hash = HashString("SHA256", Parse.SHA256Hash());
+        ExpectedHash = HashString("SHA256", Parse.SHA256Hash());

       else if (Parse.SHA1Hash() != "")
       else if (Parse.SHA1Hash() != "")

-        hash = HashString("SHA1", Parse.SHA1Hash());
+        ExpectedHash = HashString("SHA1", Parse.SHA1Hash());

       else 
       else 

-        hash = HashString("MD5Sum", Parse.MD5Hash());
+        ExpectedHash = HashString("MD5Sum", Parse.MD5Hash());

       if (PkgFile.empty() == true)
         return _error->Error(_("The package index files are corrupted. No Filename: "
                              "field for package %s."),
       if (PkgFile.empty() == true)
         return _error->Error(_("The package index files are corrupted. No Filename: "
                              "field for package %s."),


@@ -1394,7 +1394,7 @@ void pkgAcqArchive::Done(string Message,unsigned long Size,string CalcHash,
    }
    
    // Check the hash
    }
    
    // Check the hash

-   if(!hash.VerifyFile(DestFile))
+   if(ExpectedHash.toStr() != CalcHash)

    {
       Status = StatError;
       ErrorText = _("Hash Sum mismatch");
    {
       Status = StatError;
       ErrorText = _("Hash Sum mismatch");


@@ -1492,10 +1492,10 @@ void pkgAcqArchive::Finished()
 // AcqFile::pkgAcqFile - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* The file is added to the queue */
 // AcqFile::pkgAcqFile - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* The file is added to the queue */

-pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
+pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash,

                       unsigned long Size,string Dsc,string ShortDesc,
                       const string &DestDir, const string &DestFilename) :
                       unsigned long Size,string Dsc,string ShortDesc,
                       const string &DestDir, const string &DestFilename) :

-                       Item(Owner), hash(MD5)
+                       Item(Owner), ExpectedHash(Hash)

 {
    Retries = _config->FindI("Acquire::Retries",0);
    
 {
    Retries = _config->FindI("Acquire::Retries",0);
    


@@ -1537,8 +1537,8 @@ void pkgAcqFile::Done(string Message,unsigned long Size,string CalcHash,
 {
    Item::Done(Message,Size,CalcHash,Cnf);
 
 {
    Item::Done(Message,Size,CalcHash,Cnf);
 

-   // Check the md5
-   if(!hash.VerifyFile(DestFile))
+   // Check the hash
+   if(ExpectedHash.toStr() != CalcHash)

    {
       Status = StatError;
       ErrorText = "Hash Sum mismatch";
    {
       Status = StatError;
       ErrorText = "Hash Sum mismatch";

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 08b75c6d275b17eb4a98f2e74bd075332a3e2312..edd9102305ed2c3292027024a83f134d3aaf196e 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -523,6 +523,7 @@ class pkgAcqIndex : public pkgAcquire::Item
                     pkgAcquire::MethodConfig *Cnf);
    virtual string Custom600Headers();
    virtual string DescURI() {return RealURI + CompressionExtension;};
                     pkgAcquire::MethodConfig *Cnf);
    virtual string Custom600Headers();
    virtual string DescURI() {return RealURI + CompressionExtension;};

+   virtual string HashSum() {return ExpectedHash.toStr(); };

 
    /** \brief Create a pkgAcqIndex.
     *
 
    /** \brief Create a pkgAcqIndex.
     *


@@ -777,7 +778,7 @@ class pkgAcqArchive : public pkgAcquire::Item
    pkgRecords *Recs;
 
    /** \brief The hashsum of this package. */
    pkgRecords *Recs;
 
    /** \brief The hashsum of this package. */

-   HashString hash;
+   HashString ExpectedHash;

 
    /** \brief A location in which the actual filename of the package
     *  should be stored.
 
    /** \brief A location in which the actual filename of the package
     *  should be stored.


@@ -810,7 +811,7 @@ class pkgAcqArchive : public pkgAcquire::Item
    virtual string DescURI() {return Desc.URI;};
    virtual string ShortDesc() {return Desc.ShortDesc;};
    virtual void Finished();
    virtual string DescURI() {return Desc.URI;};
    virtual string ShortDesc() {return Desc.ShortDesc;};
    virtual void Finished();

-   virtual string HashSum() {return hash.toStr(); };
+   virtual string HashSum() {return ExpectedHash.toStr(); };

    virtual bool IsTrusted();
    
    /** \brief Create a new pkgAcqArchive.
    virtual bool IsTrusted();
    
    /** \brief Create a new pkgAcqArchive.


@@ -848,7 +849,7 @@ class pkgAcqFile : public pkgAcquire::Item
    pkgAcquire::ItemDesc Desc;
 
    /** \brief The hashsum of the file to download, if it is known. */
    pkgAcquire::ItemDesc Desc;
 
    /** \brief The hashsum of the file to download, if it is known. */

-   HashString hash;
+   HashString ExpectedHash;

 
    /** \brief How many times to retry the download, set from
     *  Acquire::Retries.
 
    /** \brief How many times to retry the download, set from
     *  Acquire::Retries.


@@ -861,8 +862,8 @@ class pkgAcqFile : public pkgAcquire::Item
    virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
    virtual void Done(string Message,unsigned long Size,string CalcHash,
                     pkgAcquire::MethodConfig *Cnf);
    virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
    virtual void Done(string Message,unsigned long Size,string CalcHash,
                     pkgAcquire::MethodConfig *Cnf);

-   virtual string HashSum() {return hash.toStr(); };

    virtual string DescURI() {return Desc.URI;};
    virtual string DescURI() {return Desc.URI;};

+   virtual string HashSum() {return ExpectedHash.toStr(); };

 
    /** \brief Create a new pkgAcqFile object.
     *
 
    /** \brief Create a new pkgAcqFile object.
     *

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 7dee7d3e7a8b4fb4d3b8bfbe6ea21749c8e64e3d..bc29417f776e9d3b5db93b7d3fedf0229c2094e6 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -176,7 +176,10 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
                      TimeRFC1123(Res.LastModified).c_str());
 
    if (Res.MD5Sum.empty() == false)
                      TimeRFC1123(Res.LastModified).c_str());
 
    if (Res.MD5Sum.empty() == false)

+   {

       End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
       End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());

+      End += snprintf(End,sizeof(S)-50 - (End - S),"MD5Sum-Hash: %s\n",Res.MD5Sum.c_str());
+   }

    if (Res.SHA1Sum.empty() == false)
       End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str());
    if (Res.SHA256Sum.empty() == false)
    if (Res.SHA1Sum.empty() == false)
       End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str());
    if (Res.SHA256Sum.empty() == false)

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 25d40ef542f82a7f8af80c75e6284b6b2c1cf7ff..460f599611dba48868c515b7535ad6584fe95365 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -267,8 +267,23 @@ bool pkgAcquire::Worker::RunMessages()
               _error->Warning("Bizarre Error - File size is not what the server reported %s %lu",
                               LookupTag(Message,"Size","0").c_str(),TotalSize);
 
               _error->Warning("Bizarre Error - File size is not what the server reported %s %lu",
                               LookupTag(Message,"Size","0").c_str(),TotalSize);
 

+           // see if there is a hash to verify
+           string RecivedHash;
+           HashString expectedHash(Owner->HashSum());
+           if(!expectedHash.empty()) 
+           {
+              string hashTag = expectedHash.HashType()+"-Hash";
+              RecivedHash = expectedHash.HashType() + ":" + LookupTag(Message, hashTag.c_str());
+              if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
+              {
+                 clog << "201 URI Done: " << Owner->DescURI() << endl
+                      << "RecivedHash: " << RecivedHash << endl
+                      << "ExpectedHash: " << expectedHash.toStr() 
+                      << endl << endl;
+              }
+           }

            Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
            Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),

-                       LookupTag(Message,"MD5-Hash"),Config);
+                       RecivedHash.c_str(), Config);

            ItemDone();
            
            // Log that we are done
            ItemDone();
            
            // Log that we are done

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index da714f9970e22ebc45d171f0b3aa949158a84dd0..fcc2f887cb704b825f18ced40959f952e6e4e084 100644 (file)
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -44,7 +44,7 @@ HashString::HashString(string StringedHash)
       return;
    }
    string::size_type pos = StringedHash.find(":");
       return;
    }
    string::size_type pos = StringedHash.find(":");

-   Type = StringedHash.substr(0,pos-1);
+   Type = StringedHash.substr(0,pos);

    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 
    if(_config->FindB("Debug::Hashes",false) == true)
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 
    if(_config->FindB("Debug::Hashes",false) == true)

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 86c0eb2ad831158a7e59d0db08d52991d465724e..93e7b25d96777d3f42501c19f30d9d2a3a5da79f 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -38,6 +38,9 @@ class HashString
    HashString(string StringedHashString);  // init from str as "type:hash"
    HashString();
 
    HashString(string StringedHashString);  // init from str as "type:hash"
    HashString();
 

+   // get hash type used
+   string HashType() { return Type; };
+

    // verify the given filename against the currently loaded hash
    bool VerifyFile(string filename) const;
 
    // verify the given filename against the currently loaded hash
    bool VerifyFile(string filename) const;
 

diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index bc0e5503658c572c349052697a69d9a51c96250c..801c7cfd0c55df84ee12b1b465f0b5760910c8f4 100644 (file)
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -18,7 +18,7 @@
 
 // See the makefile
 #define APT_PKG_MAJOR 4
 
 // See the makefile
 #define APT_PKG_MAJOR 4

-#define APT_PKG_MINOR 4
+#define APT_PKG_MINOR 5

 #define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;
 #define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index df9954f67579b6f7125e584ef8f8bcc901544db1..78c24fe8333d7c2937bfa240ba70543128356337 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -13,7 +13,7 @@ include ../buildlib/defaults.mak
 # methods/makefile - FIXME
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
 # methods/makefile - FIXME
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)

-MAJOR=4.4
+MAJOR=4.5

 MINOR=0
 SLIBS=$(PTHREADLIB) $(INTLLIBS)
 APT_DOMAIN:=libapt-pkg$(MAJOR)
 MINOR=0
 SLIBS=$(PTHREADLIB) $(INTLLIBS)
 APT_DOMAIN:=libapt-pkg$(MAJOR)

diff --git a/methods/makefile b/methods/makefile
index f178cbbeac3344c796a1be5b1cc44e9771a112f6..16900116a19b7e6b5499a45c433385aac5f94794 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 # FIXME..
 BIN := $(BIN)/methods
 
 # FIXME..

-LIB_APT_PKG_MAJOR = 4.4
+LIB_APT_PKG_MAJOR = 4.5

 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method