Md5 support

Author: jgg
Date: 1998-10-31 05:19:59 GMT
Md5 support

apt-pkg/contrib/md5.cc

@@ -0,0 +1,392 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+// $Id: md5.cc,v 1.1 1998/10/31 05:19:59 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.
+ 
+   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>.
+   
+   Changed into a C++ interface and made work with APT's config.h.
+    - Jason Gunthorpe <jgg@gpu.srv.ualberta.ca>
+   
+   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
+   
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#ifdef __GNUG__
+#pragma interface "apt-pkg/md5.h"
+#endif
+
+#include <apt-pkg/md5.h>
+#include <string.h>
+#include <system.h>
+#include <unistd.h>
+#include <config.h>
+									/*}}}*/
+
+// byteSwap - Swap bytes in a buffer					/*{{{*/
+// ---------------------------------------------------------------------
+/* This byteswap function will swap byte in a buffer of data */
+#ifdef WORDS_BIGENDIAN
+static void byteSwap(UINT32 *buf, unsigned words)
+{
+   unsigned char *p = (unsigned char *)buf;
+   
+   do 
+   {
+      *buf++ = (UINT32)((unsigned)p[3] << 8 | p[2]) << 16 |
+	 ((unsigned)p[1] << 8 | p[0]);
+      p += 4;
+   } while (--words);
+}
+#else
+#define byteSwap(buf,words)
+#endif
+									/*}}}*/
+// 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
+   the data and converts bytes into longwords for this routine. */
+
+// The four core functions - F1 is optimized somewhat
+// #define F1(x, y, z) (x & y | ~x & z)
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+// This is the central step in the MD5 algorithm.
+#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])
+{
+   register UINT32 a, b, c, d;
+   
+   a = buf[0];
+   b = buf[1];
+   c = buf[2];
+   d = buf[3];
+   
+   MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+   MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+   MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+   MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+   MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+   MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+   MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+   MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+   MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+   MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+   MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+   MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+   MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+   MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+   MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+   MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+   MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+   MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+   MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+   MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+   MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+   MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+   MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+   MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+   MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+   MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+   MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+   MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+   MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+   MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+   MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+   MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+   
+   MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+   MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+   MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+   MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+   MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+   MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+   MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+   MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+   MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+   MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+   MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+   MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+   MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+   MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+   MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+   MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+   
+   MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+   MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+   MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+   MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+   MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+   MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+   MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+   MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+   MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+   MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+   MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+   MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+   MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+   MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+   MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+   MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+   
+   buf[0] += a;
+   buf[1] += b;
+   buf[2] += c;
+   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 */
+MD5SumValue::MD5SumValue(string Str)
+{
+   memset(Sum,0,sizeof(Sum));
+   Set(Str);
+}
+									/*}}}*/
+// MD5SumValue::MD5SumValue - Default constructor			/*{{{*/
+// ---------------------------------------------------------------------
+/* Sets the value to 0 */
+MD5SumValue::MD5SumValue()
+{
+   memset(Sum,0,sizeof(Sum));
+}
+									/*}}}*/
+// MD5SumValue::Set - Set the sum from a string				/*{{{*/
+// ---------------------------------------------------------------------
+/* 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;
+}
+									/*}}}*/
+// MD5SumValue::Value - Convert the number into a string		/*{{{*/
+// ---------------------------------------------------------------------
+/* Converts the set of chars into a hex string in lower case */
+string MD5SumValue::Value() const
+{
+   char Conv[16] = {'0','1','2','3','4','5','6','7','8','9','a','b',
+                    'c','d','e','f'};
+   char Result[33];
+   Result[32] = 0;
+   
+   // Convert each char into two letters
+   int J = 0;
+   int I = 0;
+   for (; I != 32; J++, I += 2)
+   {
+      Result[I] = Conv[Sum[J] >> 4];
+      Result[I + 1] = Conv[Sum[J] & 0xF];
+   } 
+
+   return string(Result);
+}
+									/*}}}*/
+// MD5SumValue::operator == - Comparitor				/*{{{*/
+// ---------------------------------------------------------------------
+/* Call memcmp  on the buffer */
+bool MD5SumValue::operator ==(const MD5SumValue &rhs) const
+{
+   return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
+}
+									/*}}}*/
+// MD5Summation::MD5Summation - Initialize the summer			/*{{{*/
+// ---------------------------------------------------------------------
+/* This assigns the deep magic initial values */
+MD5Summation::MD5Summation()
+{
+   UINT32 *buf = (UINT32 *)Buf;
+   UINT32 *bytes = (UINT32 *)Bytes;
+   
+   buf[0] = 0x67452301;
+   buf[1] = 0xefcdab89;
+   buf[2] = 0x98badcfe;
+   buf[3] = 0x10325476;
+   
+   bytes[0] = 0;
+   bytes[1] = 0;
+   Done = false;
+}
+									/*}}}*/
+// MD5Summation::Add - 'Add' a data set to the sum			/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+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;
+
+   // Update byte count and carry (this could be done with a long long?)
+   UINT32 t = bytes[0];
+   if ((bytes[0] = t + len) < t)
+      bytes[1]++;	
+
+   // Space available in ctx->in (at least 1)
+   t = 64 - (t & 0x3f);	
+   if (t > len) 
+   {
+      memcpy((unsigned char *)in + 64 - t,data,len);
+      return true;
+   }
+
+   // First chunk is an odd size
+   memcpy((unsigned char *)in + 64 - t,data,t);
+   byteSwap(in, 16);
+   MD5Transform(buf,in);
+   data += t;
+   len -= t;
+   
+   // Process data in 64-byte chunks
+   while (len >= 64)
+   {
+      memcpy(in,data,64);
+      byteSwap(in,16);
+      MD5Transform(buf,in);
+      data += 64;
+      len -= 64;
+   }
+
+   // Handle any remaining bytes of data.
+   memcpy(in,data,len);
+
+   return true;   
+}
+									/*}}}*/
+// MD5Summation::AddFD - Add the contents of a FD to the hash		/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool MD5Summation::AddFD(int Fd,unsigned long Size)
+{
+   unsigned char Buf[64*64];
+   int Res = 0;
+   while (Size != 0)
+   {
+      Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
+      if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
+	 return false;
+      Size -= Res;
+      Add(Buf,Res);
+   }
+   return true;
+}
+									/*}}}*/
+// MD5Summation::Result - Returns the value of the sum			/*{{{*/
+// ---------------------------------------------------------------------
+/* Because this must add in the last bytes of the series it prevents anyone
+   from calling add after. */
+MD5SumValue MD5Summation::Result()
+{
+   UINT32 *buf = (UINT32 *)Buf;
+   UINT32 *bytes = (UINT32 *)Bytes;
+   UINT32 *in = (UINT32 *)In;
+   
+   if (Done == false)
+   {
+      // Number of bytes in In
+      int count = bytes[0] & 0x3f;	
+      unsigned char *p = (unsigned char *)in + count;
+      
+      // Set the first char of padding to 0x80.  There is always room.
+      *p++ = 0x80;
+      
+      // Bytes of padding needed to make 56 bytes (-8..55)
+      count = 56 - 1 - count;
+      
+      // Padding forces an extra block 
+      if (count < 0) 
+      {
+	 memset(p,0,count + 8);
+	 byteSwap(in, 16);
+	 MD5Transform(buf,in);
+	 p = (unsigned char *)in;
+	 count = 56;
+      }
+      
+      memset(p, 0, count);
+      byteSwap(in, 14);
+      
+      // Append length in bits and transform
+      in[14] = bytes[0] << 3;
+      in[15] = bytes[1] << 3 | bytes[0] >> 29;
+      MD5Transform(buf,in);   
+      byteSwap(buf,4);
+      Done = true;
+   }
+   
+   MD5SumValue V;
+   memcpy(V.Sum,buf,16);
+   return V;
+}
+									/*}}}*/

apt-pkg/contrib/md5.h

@@ -0,0 +1,67 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+// $Id: md5.h,v 1.1 1998/10/31 05:19:59 jgg Exp $
+/* ######################################################################
+   
+   MD5SumValue - Storage for a MD5Sum
+   MD5Summation - MD5 Message Digest Algorithm.
+   
+   This is a C++ interface to a set of MD5Sum functions. The class can
+   store a MD5Sum in 16 bytes of memory.
+   
+   A MD5Sum is used to generate a (hopefully) unique 16 byte number for a
+   block of data. This can be used to gaurd against corruption of a file.
+   
+   There are two classes because computing a MD5 is not a continual 
+   operation unless 64 byte blocks are used. Also the summation requires an
+   extra 18*4 bytes to operate.
+   
+   ##################################################################### */
+									/*}}}*/
+#ifndef APTPKG_MD5_H
+#define APTPKG_MD5_H
+
+#ifdef __GNUG__
+#pragma interface "apt-pkg/md5.h"
+#endif 
+
+#include <string>
+
+class MD5Summation;
+
+class MD5SumValue
+{
+   friend MD5Summation;
+   unsigned char Sum[4*4];
+   
+   public:
+
+   // Accessors
+   bool operator ==(const MD5SumValue &rhs) const; 
+   string Value() const;
+   inline operator string() const {return Value();}; 
+   bool Set(string Str);
+   
+   MD5SumValue(string Str);
+   MD5SumValue();
+};
+
+class MD5Summation
+{
+   unsigned char Buf[4*4];
+   unsigned char Bytes[2*4];
+   unsigned char In[16*4];
+   bool Done;
+   
+   public:
+
+   bool Add(const unsigned char *Data,unsigned long Size);
+   bool AddFD(int Fd,unsigned long Size);
+   inline bool Add(const unsigned char *Beg,const unsigned char *End) 
+                  {return Add(Beg,End-Beg);};
+   MD5SumValue Result();
+   
+   MD5Summation();
+};
+
+#endif

apt-pkg/makefile

@@ -17,7 +17,8 @@ SLIBS=$(PTHREADLIB)
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
-         contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc
+         contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
+	 contrib/md5.cc
 
 # Source code for the main library
 SOURCE+= pkgcache.cc version.cc fileutl.cc pkgcachegen.cc depcache.cc \
@@ -33,7 +34,7 @@ HEADERS = algorithms.h depcache.h mmap.h pkgcachegen.h cacheiterators.h \
           error.h orderlist.h sourcelist.h configuration.h fileutl.h \
           packagemanager.h tagfile.h deblistparser.h init.h pkgcache.h \
           version.h progress.h pkgrecords.h debrecords.h cmndline.h \
-	  acquire.h acquire-worker.h acquire-item.h acquire-method.h
+	  acquire.h acquire-worker.h acquire-item.h acquire-method.h md5.h
 
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 

buildlib/config.h.in

@@ -33,3 +33,38 @@
 
 /* The package name string */
 #undef PACKAGE
+
+/* Generate the fixed bit size types */
+#if SIZEOF_INT == 4
+# define INT32 int
+# define UINT32 unsigned int
+#else
+# if SIZEOF_LONG == 4
+#  define INT32 long
+#  define UINT32 unsigned long
+# else
+#  if SIZEOF_SHORT == 4
+#   define INT32 short
+#   define UINT32 unsigned short
+#  else
+#   error Must have a form of 32-bit integer
+#  endif
+# endif
+#endif
+
+#if SIZEOF_INT == 2
+# define INT16 int
+# define UINT16 unsigned int
+#else
+# if SIZEOF_LONG == 2
+#  define INT16 long
+#  define UINT16 unsigned long
+# else
+#  if SIZEOF_SHORT == 2
+#   define INT16 short
+#   define UINT16 short
+#  else
+#   error Must have a form of 16-bit integer
+#  endif
+# endif
+#endif