X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fmd5.c;fp=md5.c;h=0ed0205ed711203567ef70964bc47e3aa8865294;hp=aa36b26cad3eda95b1797c4a6b09baaaae31395a;hb=9eb790d6eb4a56416d342816e1140aabd9c12de8;hpb=262e2af383382c02b8a3dda72168f6505ddae15f

diff --git a/md5.c b/pop/md5.c
similarity index 95%
rename from md5.c
rename to pop/md5.c
index aa36b26..0ed0205 100644
--- a/md5.c
+++ b/pop/md5.c
@@ -119,10 +119,10 @@ void MD5Update (context, input, inputLen)
      unsigned char *input;      /* input block */
      unsigned int inputLen;     /* length of input block */
 {
-  unsigned int i, index, partLen;
+  unsigned int i, idx, partLen;
 
   /* Compute number of bytes mod 64 */
-  index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
+  idx = (unsigned int) ((context->count[0] >> 3) & 0x3F);
 
   /* Update number of bits */
   if ((context->count[0] += ((uint32_t) inputLen << 3))
@@ -130,25 +130,25 @@ void MD5Update (context, input, inputLen)
     context->count[1]++;
   context->count[1] += ((uint32_t) inputLen >> 29);
 
-  partLen = 64 - index;
+  partLen = 64 - idx;
 
   /* Transform as many times as possible.
    */
   if (inputLen >= partLen) {
-    MD5_memcpy ((unsigned char *) & context->buffer[index], (unsigned char *) input, partLen);
+    MD5_memcpy ((unsigned char *) & context->buffer[idx], (unsigned char *) input, partLen);
     MD5Transform (context->state, context->buffer);
 
     for (i = partLen; i + 63 < inputLen; i += 64)
       MD5Transform (context->state, &input[i]);
 
-    index = 0;
+    idx = 0;
   }
   else
     i = 0;
 
   /* Buffer remaining input */
   MD5_memcpy
-    ((unsigned char *) & context->buffer[index], (unsigned char *) & input[i], inputLen - i);
+    ((unsigned char *) & context->buffer[idx], (unsigned char *) & input[i], inputLen - i);
 }
 
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
@@ -159,15 +159,15 @@ void MD5Final (digest, context)
      MD5_CTX *context;          /* context */
 {
   unsigned char bits[8];
-  unsigned int index, padLen;
+  unsigned int idx, padLen;
 
   /* Save number of bits */
   Encode (bits, context->count, 8);
 
   /* Pad out to 56 mod 64.
    */
-  index = (unsigned int) ((context->count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
+  idx = (unsigned int) ((context->count[0] >> 3) & 0x3f);
+  padLen = (idx < 56) ? (56 - idx) : (120 - idx);
   MD5Update (context, PADDING, padLen);
 
   /* Append length (before padding) */