* add --dsc-only option, thanks to K. Richard Pixley

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

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 481ea88f86b21249a65bae094bc487aa9de87a7a..eefa7bf4147dd670e21df66eeb32e3353c0563ea 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -19,6 +19,11 @@
 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>

+#include <apt-pkg/sha256.h>
+
+#include <algorithm>
+
+using std::min;

 
 class Hashes
 {
 
 class Hashes
 {


@@ -26,10 +31,11 @@ class Hashes
 
    MD5Summation MD5;
    SHA1Summation SHA1;
 
    MD5Summation MD5;
    SHA1Summation SHA1;

+   SHA256Summation SHA256;

    
    inline bool Add(const unsigned char *Data,unsigned long Size)
    {
    
    inline bool Add(const unsigned char *Data,unsigned long Size)
    {

-      return MD5.Add(Data,Size) && SHA1.Add(Data,Size);
+      return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size);

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