* 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

2 files changed, 4 insertions, 1 deletions

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index da714f997..fcc2f887c 100644
--- 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(":");
-   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)
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 86c0eb2ad..93e7b25d9 100644
--- 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();
 
+   // get hash type used
+   string HashType() { return Type; };
+
    // verify the given filename against the currently loaded hash
    bool VerifyFile(string filename) const;