summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/md5.cc2
-rw-r--r--apt-pkg/contrib/sha1.cc2
-rw-r--r--debian/changelog2
3 files changed, 4 insertions, 2 deletions
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