merged from lp:~donkult/apt/experimental

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

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 8ddd889f18a22a70b2ac9015e4772fbc195ce3a1..916faec1bca5cd9e5d3b9adf968ae0a62e44becf 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -21,30 +21,11 @@
 using std::string;
 using std::min;
 
 using std::string;
 using std::min;
 

-class SHA1Summation;
+#include "hashsum_template.h"

 
 

-class SHA1SumValue
-{
-   friend class SHA1Summation;
-   unsigned char Sum[20];
-   
-   public:
-
-   // Accessors
-   bool operator ==(const SHA1SumValue &rhs) const; 
-   string Value() const;
-   inline void Value(unsigned char S[20])
-         {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];};
-   inline operator string() const {return Value();};
-   bool Set(string Str);
-   inline void Set(unsigned char S[20]) 
-         {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];};
-
-   SHA1SumValue(string Str);
-   SHA1SumValue();
-};
+typedef  HashSumValue<160> SHA1SumValue;

 
 

-class SHA1Summation
+class SHA1Summation : public SummationImplementation

 {
    /* assumes 64-bit alignment just in case */
    unsigned char Buffer[64] __attribute__((aligned(8)));
 {
    /* assumes 64-bit alignment just in case */
    unsigned char Buffer[64] __attribute__((aligned(8)));


@@ -53,12 +34,9 @@ class SHA1Summation
    bool Done;
    
    public:
    bool Done;
    
    public:

+   bool Add(const unsigned char *inbuf, unsigned long long inlen);
+   using SummationImplementation::Add;

 
 

-   bool Add(const unsigned char *inbuf,unsigned long inlen);
-   inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
-   bool AddFD(int Fd,unsigned long Size);
-   inline bool Add(const unsigned char *Beg,const unsigned char *End) 
-                  {return Add(Beg,End-Beg);};

    SHA1SumValue Result();
    
    SHA1Summation();
    SHA1SumValue Result();
    
    SHA1Summation();