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 6c60ffd743a69bfad91b7ce66031be367e34a831..6820d39516c6c0c44cb0205375c524f82cb11cd7 100644 (file)
--- 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 0b1c16dc3af3ae111cc30715500fbdd006a1911b..9a6725ef394c1c8c0e8856b2c5191c086b3c77ac 100644 (file)
--- 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 97fd9a5b5ef8229e6a2ec5da7148eed2e4f96af6..478d6e1e242bf5a72c35d1c6414b328cff3559bb 100644 (file)
--- 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