diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:12 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:12 +0000 |
| commit | 678bc33eaf95356d1b63090d220b65162478b89a (patch) | |
| tree | 8e5ab6fadf5d8d94aa16fbb2f05feb001ca0b841 /apt-pkg | |
| parent | f3bab4fd4525bf5f7401a261ce24dbea70a6c479 (diff) | |
BSD testing fixes
Author: jgg
Date: 2001-03-11 05:30:20 GMT
BSD testing fixes
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/hashes.h | 7 | ||||
| -rw-r--r-- | apt-pkg/contrib/sha1.cc | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index e00eaeb2d..481ea88f8 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: hashes.h,v 1.1 2001/03/06 07:15:29 jgg Exp $ +// $Id: hashes.h,v 1.2 2001/03/11 05:30:20 jgg Exp $ /* ###################################################################### Hashes - Simple wrapper around the hash functions @@ -14,7 +14,7 @@ #define APTPKG_HASHES_H #ifdef __GNUG__ -#pragma interface "apt-pkg/hashesh.h" +#pragma interface "apt-pkg/hashes.h" #endif #include <apt-pkg/md5.h> @@ -29,8 +29,7 @@ class Hashes inline bool Add(const unsigned char *Data,unsigned long Size) { - MD5.Add(Data,Size); - SHA1.Add(Data,Size); + return MD5.Add(Data,Size) && SHA1.Add(Data,Size); }; inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));}; bool AddFD(int Fd,unsigned long Size); diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index 1f3927c1c..b1c80925f 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sha1.cc,v 1.1 2001/03/06 05:03:49 jgg Exp $ +// $Id: sha1.cc,v 1.2 2001/03/11 05:30:20 jgg Exp $ /* ###################################################################### SHA1 - SHA-1 Secure Hash Algorithm. @@ -269,7 +269,6 @@ SHA1SumValue SHA1Summation::Result() { uint32_t *state = (uint32_t *)State; uint32_t *count = (uint32_t *)Count; - uint8_t *buffer = (uint8_t *)Buffer; // Apply the padding if (Done == false) |