From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 5 Jul 2011 13:02:59 +0000 (+0100)
Subject: merge lp:~mvo/apt/sha512-template to get fixes for the
X-Git-Tag: 0.9.0~86
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/cec8c646c79e40d928464b08a6f2e3ea62bb1611?hp=f5b622ed48fdbe235d81b61b3edd8dbb84d9cc9c

merge lp:~mvo/apt/sha512-template to get fixes for the
sha1/md5 verifiation (closes: #632520)
---

diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 6c60ffd74..6820d3951 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -298,7 +298,7 @@ MD5SumValue MD5Summation::Result()
    }
    
    MD5SumValue V;
-   V.Set((char *)buf);
+   V.Set((unsigned char *)buf);
    return V;
 }
 									/*}}}*/
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index 0b1c16dc3..9a6725ef3 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -229,7 +229,7 @@ SHA1SumValue SHA1Summation::Result()
 
    // Transfer over the result
    SHA1SumValue Value;
-   char res[20];
+   unsigned char res[20];
    for (unsigned i = 0; i < 20; i++)
    {
       res[i] = (unsigned char)
diff --git a/debian/changelog b/debian/changelog
index 97fd9a5b5..478d6e1e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 apt (0.8.16~exp3) UNRELEASEDexperimental; urgency=low
 
   * merge fixes from the debian/unstable upload
+  * merge lp:~mvo/apt/sha512-template to get fixes for the 
+    sha1/md5 verifiation (closes: #632520)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jun 2011 09:19:27 +0100