Explorar o código

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

Michael Vogt %!s(int64=15) %!d(string=hai) anos
pai
achega
cec8c646c7
Modificáronse 3 ficheiros con 4 adicións e 2 borrados
  1. 1 1
      apt-pkg/contrib/md5.cc
  2. 1 1
      apt-pkg/contrib/sha1.cc
  3. 2 0
      debian/changelog

+ 1 - 1
apt-pkg/contrib/md5.cc

@@ -298,7 +298,7 @@ MD5SumValue MD5Summation::Result()
    }
    }
    
    
    MD5SumValue V;
    MD5SumValue V;
-   V.Set((char *)buf);
+   V.Set((unsigned char *)buf);
    return V;
    return V;
 }
 }
 									/*}}}*/
 									/*}}}*/

+ 1 - 1
apt-pkg/contrib/sha1.cc

@@ -229,7 +229,7 @@ SHA1SumValue SHA1Summation::Result()
 
 
    // Transfer over the result
    // Transfer over the result
    SHA1SumValue Value;
    SHA1SumValue Value;
-   char res[20];
+   unsigned char res[20];
    for (unsigned i = 0; i < 20; i++)
    for (unsigned i = 0; i < 20; i++)
    {
    {
       res[i] = (unsigned char)
       res[i] = (unsigned char)

+ 2 - 0
debian/changelog

@@ -1,6 +1,8 @@
 apt (0.8.16~exp3) UNRELEASEDexperimental; urgency=low
 apt (0.8.16~exp3) UNRELEASEDexperimental; urgency=low
 
 
   * merge fixes from the debian/unstable upload
   * 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
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jun 2011 09:19:27 +0100