projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* fix languages like pt_PT, pt_BR, zh_CN by special casing
[apt.git]
/
apt-pkg
/
contrib
/
md5.cc
diff --git
a/apt-pkg/contrib/md5.cc
b/apt-pkg/contrib/md5.cc
index 2beaa120405f8f05c3f4738b3666205fd421e027..fded5c86452a838394915177b601e465a8486a97 100644
(file)
--- a/
apt-pkg/contrib/md5.cc
+++ b/
apt-pkg/contrib/md5.cc
@@
-1,6
+1,6
@@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: md5.cc,v 1.
6 1999/10/31 06:32:28
jgg Exp $
+// $Id: md5.cc,v 1.
12 2001/05/13 05:15:03
jgg Exp $
/* ######################################################################
MD5Sum - MD5 Message Digest Algorithm.
/* ######################################################################
MD5Sum - MD5 Message Digest Algorithm.
@@
-43,23
+43,24
@@
#include <apt-pkg/strutl.h>
#include <string.h>
#include <apt-pkg/strutl.h>
#include <string.h>
-#include <system.h>
#include <unistd.h>
#include <netinet/in.h> // For htonl
#include <inttypes.h>
#include <unistd.h>
#include <netinet/in.h> // For htonl
#include <inttypes.h>
+#include <config.h>
+#include <system.h>
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
// ---------------------------------------------------------------------
/* Swap n 32 bit longs in given buffer */
#ifdef WORDS_BIGENDIAN
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
// ---------------------------------------------------------------------
/* Swap n 32 bit longs in given buffer */
#ifdef WORDS_BIGENDIAN
-static void byteSwap(uint
8
_t *buf, unsigned words)
+static void byteSwap(uint
32
_t *buf, unsigned words)
{
uint8_t *p = (uint8_t *)buf;
do
{
{
uint8_t *p = (uint8_t *)buf;
do
{
- *buf++ = (
UINT32
)((unsigned)p[3] << 8 | p[2]) << 16 |
+ *buf++ = (
uint32_t
)((unsigned)p[3] << 8 | p[2]) << 16 |
((unsigned)p[1] << 8 | p[0]);
p += 4;
} while (--words);
((unsigned)p[1] << 8 | p[0]);
p += 4;
} while (--words);
@@
-190,7
+191,7
@@
MD5SumValue::MD5SumValue()
/* Converts the hex string into a set of chars */
bool MD5SumValue::Set(string Str)
{
/* Converts the hex string into a set of chars */
bool MD5SumValue::Set(string Str)
{
- return Hex2Num(Str
.begin(),Str.end()
,Sum,sizeof(Sum));
+ return Hex2Num(Str,Sum,sizeof(Sum));
}
/*}}}*/
// MD5SumValue::Value - Convert the number into a string /*{{{*/
}
/*}}}*/
// MD5SumValue::Value - Convert the number into a string /*{{{*/
@@
-298,8
+299,8
@@
bool MD5Summation::AddFD(int Fd,unsigned long Size)
int Res = 0;
while (Size != 0)
{
int Res = 0;
while (Size != 0)
{
- Res = read(Fd,Buf,
MIN(Size,
sizeof(Buf)));
- if (Res < 0 || (unsigned)Res !=
MIN(Size,
sizeof(Buf)))
+ Res = read(Fd,Buf,
min(Size,(unsigned long)
sizeof(Buf)));
+ if (Res < 0 || (unsigned)Res !=
min(Size,(unsigned long)
sizeof(Buf)))
return false;
Size -= Res;
Add(Buf,Res);
return false;
Size -= Res;
Add(Buf,Res);