* fix for output of the description and the debTranslationsIndex::Exists()

[apt.git] / apt-pkg / contrib / md5.cc

diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 381c3875392053042381915ec019656672a7a3ac..2bd74515396326ebfe88d760257a559af1da3205 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.5 1999/10/25 04:10:02 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,31 @@
 #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 */
                                                                        /*}}}*/
 
 // byteSwap - Swap bytes in a buffer                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* Swap n 32 bit longs in given buffer */

-inline static void byteSwap(uint32_t *buf, unsigned words)
+#ifdef WORDS_BIGENDIAN
+static void byteSwap(uint32_t *buf, unsigned words)

 {
 {

-   do
+   uint8_t *p = (uint8_t *)buf;
+   
+   do 

    {
    {

-      *buf++ = htonl(*buf);
-   }
-   while (--words);   
+      *buf++ = (uint32_t)((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                          /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // MD5Transform - Alters an existing MD5 hash                          /*{{{*/
 // ---------------------------------------------------------------------


@@ -183,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               /*{{{*/