* apt-inst/deb/debfile.h:

[apt.git] / apt-pkg / contrib / sha1.cc

diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index 9416895ac8d5afa0dd7245cb3d579e882b87365f..b5a6a244064f21dbc2200cb8b1b51b39df929914 100644 (file)
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -75,10 +75,9 @@ static void SHA1Transform(uint32_t state[5],uint8_t const buffer[64])
       uint32_t l[16];
    }
    CHAR64LONG16;
       uint32_t l[16];
    }
    CHAR64LONG16;

-   CHAR64LONG16 *block;
+   CHAR64LONG16 workspace, *block;

 
 

-   uint8_t workspace[64];
-   block = (CHAR64LONG16 *)workspace;
+   block = &workspace;

    memcpy(block,buffer,sizeof(workspace));
 
    /* Copy context->state[] to working vars */
    memcpy(block,buffer,sizeof(workspace));
 
    /* Copy context->state[] to working vars */


@@ -243,7 +242,7 @@ SHA1SumValue SHA1Summation::Result()
 // SHA1Summation::Add - Adds content of buffer into the checksum        /*{{{*/
 // ---------------------------------------------------------------------
 /* May not be called after Result() is called */
 // SHA1Summation::Add - Adds content of buffer into the checksum        /*{{{*/
 // ---------------------------------------------------------------------
 /* May not be called after Result() is called */

-bool SHA1Summation::Add(const unsigned char *data,unsigned long len)
+bool SHA1Summation::Add(const unsigned char *data,unsigned long long len)

 {
    if (Done)
       return false;
 {
    if (Done)
       return false;