* merged from apt--mvo

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

diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index b1c80925fec4e40512aa9916ff5f451bcb1bbcc0..b70f31dc6792619dea08ca492ecac8f6afc88b1a 100644 (file)
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                          /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                          /*{{{*/

-// $Id: sha1.cc,v 1.2 2001/03/11 05:30:20 jgg Exp $
+// $Id: sha1.cc,v 1.3 2001/05/13 05:15:03 jgg Exp $

 /* ######################################################################
    
    SHA1 - SHA-1 Secure Hash Algorithm.
 /* ######################################################################
    
    SHA1 - SHA-1 Secure Hash Algorithm.


@@ -29,10 +29,6 @@
  */
                                                                        /*}}} */
 // Include Files                                                        /*{{{*/
  */
                                                                        /*}}} */
 // Include Files                                                        /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sha1.h"
-#endif
-

 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>
 


@@ -206,7 +202,7 @@ SHA1SumValue::SHA1SumValue()
 /* Converts the hex string into a set of chars */
 bool SHA1SumValue::Set(string Str)
 {
 /* Converts the hex string into a set of chars */
 bool SHA1SumValue::Set(string Str)
 {

-   return Hex2Num(Str.begin(),Str.end(),Sum,sizeof(Sum));
+   return Hex2Num(Str,Sum,sizeof(Sum));

 }
 
                                                                        /*}}} */
 }
 
                                                                        /*}}} */


@@ -343,11 +339,16 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
 {
    unsigned char Buf[64 * 64];
    int Res = 0;
 {
    unsigned char Buf[64 * 64];
    int Res = 0;

-   while (Size != 0)
+   int ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)

    {
    {

-      Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
-      if (Res < 0 || (unsigned) Res != MIN(Size,sizeof(Buf)))
+      unsigned n = sizeof(Buf);
+      if (!ToEOF) n = min(Size,(unsigned long)n);
+      Res = read(Fd,Buf,n);
+      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read

         return false;
         return false;

+      if (ToEOF && Res == 0) // EOF
+         break;

       Size -= Res;
       Add(Buf,Res);
    }
       Size -= Res;
       Add(Buf,Res);
    }