// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: md5.cc,v 1.2 1998/11/01 05:27:36 jgg Exp $
+// $Id: md5.cc,v 1.12 2001/05/13 05:15:03 jgg Exp $
/* ######################################################################
MD5Sum - MD5 Message Digest Algorithm.
- This code implements the MD5 message-digest algorithm.
- The algorithm is due to Ron Rivest. This code was
- written by Colin Plumb in 1993, no copyright is claimed.
- This code is in the public domain; do with it what you wish.
-
- Equivalent code is available from RSA Data Security, Inc.
- This code has been tested against that, and is equivalent,
- except that you don't need to include two pages of legalese
- with every copy.
-
- To compute the message digest of a chunk of bytes, declare an
- MD5Context structure, pass it to MD5Init, call MD5Update as
- needed on buffers full of bytes, and then call MD5Final, which
- will fill a supplied 16-byte array with the digest.
+ This code implements the MD5 message-digest algorithm. The algorithm is
+ due to Ron Rivest. This code was written by Colin Plumb in 1993, no
+ copyright is claimed. This code is in the public domain; do with it what
+ you wish.
+ Equivalent code is available from RSA Data Security, Inc. This code has
+ been tested against that, and is equivalent, except that you don't need to
+ include two pages of legalese with every copy.
+
+ To compute the message digest of a chunk of bytes, instantiate the class,
+ and repeatedly call one of the Add() members. When finished the Result
+ method will return the Hash and finalize the value.
+
Changed so as no longer to depend on Colin Plumb's `usual.h' header
definitions; now uses stuff from dpkg's config.h.
- Ian Jackson <ijackson@nyx.cs.du.edu>.
Still in the public domain.
The classes use arrays of char that are a specific size. We cast those
- arrays to UINT32's and go from there. This allows us to advoid using
- config.h in a public header or internally newing memory.
-
- Some of the terms may be quite bogus, I don't really know the details of
- MD5, just converted the code ;> - JGG
+ arrays to uint8_t's and go from there. This allows us to advoid using
+ the uncommon inttypes.h in a public header or internally newing memory.
+ In theory if C9x becomes nicely accepted
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/md5.h"
-#endif
-
#include <apt-pkg/md5.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
+
#include <string.h>
-#include <system.h>
#include <unistd.h>
+#include <netinet/in.h> // For htonl
+#include <inttypes.h>
#include <config.h>
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
// ---------------------------------------------------------------------
-/* This byteswap function will swap byte in a buffer of data */
+/* Swap n 32 bit longs in given buffer */
#ifdef WORDS_BIGENDIAN
-static void byteSwap(UINT32 *buf, unsigned words)
+static void byteSwap(uint32_t *buf, unsigned words)
{
- unsigned char *p = (unsigned char *)buf;
+ 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);
// MD5Transform - Alters an existing MD5 hash /*{{{*/
// ---------------------------------------------------------------------
/* The core of the MD5 algorithm, this alters an existing MD5 hash to
- reflect the addition of 16 longwords of new data. MD5Update blocks
+ reflect the addition of 16 longwords of new data. Add blocks
the data and converts bytes into longwords for this routine. */
// The four core functions - F1 is optimized somewhat
#define MD5STEP(f,w,x,y,z,in,s) \
(w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
-static void MD5Transform(UINT32 buf[4], UINT32 const in[16])
+static void MD5Transform(uint32_t buf[4], uint32_t const in[16])
{
- register UINT32 a, b, c, d;
+ register uint32_t a, b, c, d;
a = buf[0];
b = buf[1];
buf[3] += d;
}
/*}}}*/
-// hex_digit - Convert a hex character into an integer /*{{{*/
-// ---------------------------------------------------------------------
-/* The original version of this could only handle lower case. These routines
- do output to lowercase hex but can handle upper okay as well.*/
-static int hex_digit(int c)
-{
-
- if (c >= '0' && c <= '9')
- return c - '0';
- if (c >= 'a' && c <= 'f')
- return c - 'a' + 10;
- if (c >= 'A' && c <= 'F')
- return c - 'A' + 10;
- return 0;
-}
- /*}}}*/
// MD5SumValue::MD5SumValue - Constructs the summation from a string /*{{{*/
// ---------------------------------------------------------------------
/* The string form of a MD5 is a 32 character hex number */
// ---------------------------------------------------------------------
/* Converts the hex string into a set of chars */
bool MD5SumValue::Set(string Str)
-{
- // Check for correct length
- if (Str.length() != 32)
- return false;
-
- // Check for only hex digits
- const char *I = Str.begin();
- for (;I != Str.end(); I++)
- if (isxdigit(*I) == 0)
- return false;
-
- // Convert each digit. We store it in the same order as the string
- int J = 0;
- for (I = Str.begin(); I != Str.end();J++, I += 2)
- {
- Sum[J] = hex_digit(I[0]) << 4;
- Sum[J] += hex_digit(I[1]);
- }
-
- return true;
+{
+ return Hex2Num(Str,Sum,sizeof(Sum));
}
/*}}}*/
// MD5SumValue::Value - Convert the number into a string /*{{{*/
/*}}}*/
// MD5SumValue::operator == - Comparitor /*{{{*/
// ---------------------------------------------------------------------
-/* Call memcmp on the buffer */
+/* Call memcmp on the buffer */
bool MD5SumValue::operator ==(const MD5SumValue &rhs) const
{
return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
/* This assigns the deep magic initial values */
MD5Summation::MD5Summation()
{
- UINT32 *buf = (UINT32 *)Buf;
- UINT32 *bytes = (UINT32 *)Bytes;
+ uint32_t *buf = (uint32_t *)Buf;
+ uint32_t *bytes = (uint32_t *)Bytes;
buf[0] = 0x67452301;
buf[1] = 0xefcdab89;
Done = false;
}
/*}}}*/
-// MD5Summation::Add - 'Add' a data set to the sum /*{{{*/
+// MD5Summation::Add - 'Add' a data set to the hash /*{{{*/
// ---------------------------------------------------------------------
/* */
bool MD5Summation::Add(const unsigned char *data,unsigned long len)
if (Done == true)
return false;
- UINT32 *buf = (UINT32 *)Buf;
- UINT32 *bytes = (UINT32 *)Bytes;
- UINT32 *in = (UINT32 *)In;
+ uint32_t *buf = (uint32_t *)Buf;
+ uint32_t *bytes = (uint32_t *)Bytes;
+ uint32_t *in = (uint32_t *)In;
// Update byte count and carry (this could be done with a long long?)
- UINT32 t = bytes[0];
+ uint32_t t = bytes[0];
if ((bytes[0] = t + len) < t)
bytes[1]++;
- // Space available in ctx->in (at least 1)
+ // Space available (at least 1)
t = 64 - (t & 0x3f);
if (t > len)
{
{
unsigned char Buf[64*64];
int Res = 0;
- while (Size != 0)
+ int ToEOF = (Size == 0);
+ while (Size != 0 || ToEOF)
{
- Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
- if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
- return false;
+ 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);
}
from calling add after. */
MD5SumValue MD5Summation::Result()
{
- UINT32 *buf = (UINT32 *)Buf;
- UINT32 *bytes = (UINT32 *)Bytes;
- UINT32 *in = (UINT32 *)In;
+ uint32_t *buf = (uint32_t *)Buf;
+ uint32_t *bytes = (uint32_t *)Bytes;
+ uint32_t *in = (uint32_t *)In;
if (Done == false)
{
projects / apt.git / blobdiff