merge with debian-experimental 0.8.16~exp2 release

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

diff --git a/apt-pkg/contrib/sha2.cc b/apt-pkg/contrib/sha2.cc
index dcdbef6e757a7877c7b00652ec10b86b77be8a03..4604d3167a9bfacce539b6bc59ec8681c05bb8e5 100644 (file)
--- a/apt-pkg/contrib/sha2.cc
+++ b/apt-pkg/contrib/sha2.cc
@@ -18,91 +18,10 @@
 #include <apt-pkg/sha2.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/sha2.h>
 #include <apt-pkg/strutl.h>
 

-
-
-
-SHA512Summation::SHA512Summation()                                     /*{{{*/
-{
-   SHA512_Init(&ctx);
-   Done = false;
-}
-                                                                       /*}}}*/
-
-SHA512SumValue SHA512Summation::Result()                               /*{{{*/
-{
-   if (!Done) {
-      SHA512_Final(Sum, &ctx);
-      Done = true;
-   }
-
-   SHA512SumValue res;
-   res.Set(Sum);
-   return res;
-}
-                                                                       /*}}}*/
-bool SHA512Summation::Add(const unsigned char *inbuf,unsigned long len) /*{{{*/
-{
-   if (Done) 
-      return false;
-   SHA512_Update(&ctx, inbuf, len);
-   return true;
-}
-                                                                       /*}}}*/
-// SHA512Summation::AddFD - Add content of file into the checksum      /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool SHA512Summation::AddFD(int Fd,unsigned long Size)
-{
-   unsigned char Buf[64 * 64];
-   int Res = 0;
-   int ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF)
-   {
-      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;
-      if (ToEOF && Res == 0) // EOF
-         break;
-      Size -= Res;
-      Add(Buf,Res);
-   }
-   return true;
-}
-                                                                       /*}}}*/
-
-SHA256Summation::SHA256Summation()                                     /*{{{*/
-{
-   SHA256_Init(&ctx);
-   Done = false;
-}
-                                                                       /*}}}*/
-bool SHA256Summation::Add(const unsigned char *inbuf,unsigned long len) /*{{{*/
-{
-   if (Done) 
-      return false;
-   SHA256_Update(&ctx, inbuf, len);
-   return true;
-}
-                                                                       /*}}}*/
-SHA256SumValue SHA256Summation::Result()                               /*{{{*/
-{
-   if (!Done) {
-      SHA256_Final(Sum, &ctx);
-      Done = true;
-   }
-
-   SHA256SumValue res;
-   res.Set(Sum);
-   return res;
-}
-                                                                       /*}}}*/
-// SHA256Summation::AddFD - Add content of file into the checksum      /*{{{*/
+// SHA2Summation::AddFD - Add content of file into the checksum      /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool SHA256Summation::AddFD(int Fd,unsigned long Size)
-{
+bool SHA2SummationBase::AddFD(int Fd,unsigned long Size){

    unsigned char Buf[64 * 64];
    int Res = 0;
    int ToEOF = (Size == 0);
    unsigned char Buf[64 * 64];
    int Res = 0;
    int ToEOF = (Size == 0);