Diff for /parser3/src/lib/md5/pa_md5c.c between versions 1.6.2.1.2.2 and 1.24

version 1.6.2.1.2.2, 2003/04/24 07:16:34 version 1.24, 2025/01/10 20:12:17
Line 1 Line 1
 /** @file  /** @file
         Parser: copied from apache 1.3.20  sources.          taken from libmd, added pa_ prefixes, Parser 3 includes,
         Replaced ap_ to pa_ prefixes. linked into all targets but Apache-module target,          Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
         where linked targets/apache/pa_md5c.c stub instead.  
   
         Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)  
 */  */
   
 /*  /*      $OpenBSD: md5.c,v 1.7 2004/05/28 15:10:27 millert Exp $ */
  * This is work is derived from material Copyright RSA Data Security, Inc.  
  *  
  * The RSA copyright statement and Licence for that original material is  
  * included below. This is followed by the Apache copyright statement and  
  * licence for the modifications made to that material.  
  */  
   
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm  
  */  
   
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All  
    rights reserved.  
   
    License to copy and use this software is granted provided that it  
    is identified as the "RSA Data Security, Inc. MD5 Message-Digest  
    Algorithm" in all material mentioning or referencing this software  
    or this function.  
   
    License is also granted to make and use derivative works provided  
    that such works are identified as "derived from the RSA Data  
    Security, Inc. MD5 Message-Digest Algorithm" in all material  
    mentioning or referencing the derived work.  
   
    RSA Data Security, Inc. makes no representations concerning either  
    the merchantability of this software or the suitability of this  
    software for any particular purpose. It is provided "as is"  
    without express or implied warranty of any kind.  
   
    These notices must be retained in any copies of any part of this  
    documentation and/or software.  
  */  
   
 /* ====================================================================  /*
  * Copyright (c) 1996-1999 The Apache Group.  All rights reserved.   * This code implements the MD5 message-digest algorithm.
  *   * The algorithm is due to Ron Rivest. This code was
  * Redistribution and use in source and binary forms, with or without   * written by Colin Plumb in 1993, no copyright is claimed.
  * modification, are permitted provided that the following conditions   * This code is in the public domain; do with it what you wish.
  * are met:   *
  *   * Equivalent code is available from RSA Data Security, Inc.
  * 1. Redistributions of source code must retain the above copyright   * This code has been tested against that, and is equivalent,
  *    notice, this list of conditions and the following disclaimer.    * except that you don't need to include two pages of legalese
  *   * with every copy.
  * 2. Redistributions in binary form must reproduce the above copyright   *
  *    notice, this list of conditions and the following disclaimer in   * To compute the message digest of a chunk of bytes, declare an
  *    the documentation and/or other materials provided with the   * MD5Context structure, pass it to MD5Init, call MD5Update as
  *    distribution.   * needed on buffers full of bytes, and then call MD5Final, which
  *   * will fill a supplied 16-byte array with the digest.
  * 3. All advertising materials mentioning features or use of this  
  *    software must display the following acknowledgment:  
  *    "This product includes software developed by the Apache Group  
  *    for use in the Apache HTTP server project (http://www.apache.org/)."  
  *  
  * 4. The names "Apache Server" and "Apache Group" must not be used to  
  *    endorse or promote products derived from this software without  
  *    prior written permission. For written permission, please contact  
  *    apache@apache.org.  
  *  
  * 5. Products derived from this software may not be called "Apache"  
  *    nor may "Apache" appear in their names without prior written  
  *    permission of the Apache Group.  
  *  
  * 6. Redistributions of any form whatsoever must retain the following  
  *    acknowledgment:  
  *    "This product includes software developed by the Apache Group  
  *    for use in the Apache HTTP server project (http://www.apache.org/)."  
  *  
  * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY  
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE  
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR  
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,  
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT  
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,  
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)  
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED  
  * OF THE POSSIBILITY OF SUCH DAMAGE.  
  * ====================================================================  
  *  
  * This software consists of voluntary contributions made by many  
  * individuals on behalf of the Apache Group and was originally based  
  * on public domain software written at the National Center for  
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.  
  * For more information on the Apache Group and the Apache HTTP server  
  * project, please see <http://www.apache.org/>.  
  *  
  */   */
   
 /*  /*
  * The PA_MD5Encode() routine uses much code obtained from the FreeBSD 3.0   * The pa_MD5Encode() routine uses much code obtained from the FreeBSD 3.0
  * MD5 crypt() function, which is licenced as follows:   * MD5 crypt() function, which is licenced as follows:
  * ----------------------------------------------------------------------------   * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):   * "THE BEER-WARE LICENSE" (Revision 42):
Line 107 Line 33
  * ----------------------------------------------------------------------------   * ----------------------------------------------------------------------------
  */   */
   
 static const char* IDENT_MD5_C="$Date$";  
   
 #include <string.h>  
   
 #include "pa_md5.h"  #include "pa_md5.h"
   
 #define pa_pa_cpystrn(strDest, strSource, count) strncpy(strDest, strSource, count)  volatile const char * IDENT_PA_MD5_C="$Id$" IDENT_PA_MD5_H;
   
 /* Constants for MD5Transform routine.  #define PUT_64BIT_LE(cp, value) do {                                    \
  */          (cp)[7] = (uint8_t)((value) >> 56);                             \
           (cp)[6] = (uint8_t)((value) >> 48);                             \
 #define S11 7          (cp)[5] = (uint8_t)((value) >> 40);                             \
 #define S12 12          (cp)[4] = (uint8_t)((value) >> 32);                             \
 #define S13 17          (cp)[3] = (uint8_t)((value) >> 24);                             \
 #define S14 22          (cp)[2] = (uint8_t)((value) >> 16);                             \
 #define S21 5          (cp)[1] = (uint8_t)((value) >> 8);                              \
 #define S22 9          (cp)[0] = (uint8_t)(value); } while (0)
 #define S23 14  
 #define S24 20  #define PUT_32BIT_LE(cp, value) do {                                    \
 #define S31 4          (cp)[3] = (unsigned char)((value) >> 24);                       \
 #define S32 11          (cp)[2] = (unsigned char)((value) >> 16);                       \
 #define S33 16          (cp)[1] = (unsigned char)((value) >> 8);                        \
 #define S34 23          (cp)[0] = (unsigned char)(value); } while (0)
 #define S41 6  
 #define S42 10  static uint8_t PADDING[MD5_BLOCK_LENGTH] = {
 #define S43 15          0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 #define S44 21          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 static void MD5Transform(UINT4 state[4], const unsigned char block[64]);  
 static void Encode(unsigned char *output, const UINT4 *input,  
                    unsigned int len);  
 static void Decode(UINT4 *output, const unsigned char *input,  
                    unsigned int len);  
   
 static unsigned char PADDING[64] =  
 {  
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  
 };  };
   
 /* F, G, H and I are basic MD5 functions.  /*
  */   * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
 #define F(x, y, z) (((x) & (y)) | ((~x) & (z)))   * initialization constants.
 #define G(x, y, z) (((x) & (z)) | ((y) & (~z)))  
 #define H(x, y, z) ((x) ^ (y) ^ (z))  
 #define I(x, y, z) ((y) ^ ((x) | (~z)))  
   
 /* ROTATE_LEFT rotates x left n bits.  
  */  
 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))  
   
 /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.  
    Rotation is separate from addition to prevent recomputation.  
  */  
 #define FF(a, b, c, d, x, s, ac) { \  
  (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \  
  (a) = ROTATE_LEFT ((a), (s)); \  
  (a) += (b); \  
   }  
 #define GG(a, b, c, d, x, s, ac) { \  
  (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \  
  (a) = ROTATE_LEFT ((a), (s)); \  
  (a) += (b); \  
   }  
 #define HH(a, b, c, d, x, s, ac) { \  
  (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \  
  (a) = ROTATE_LEFT ((a), (s)); \  
  (a) += (b); \  
   }  
 #define II(a, b, c, d, x, s, ac) { \  
  (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \  
  (a) = ROTATE_LEFT ((a), (s)); \  
  (a) += (b); \  
   }  
   
 /* MD5 initialization. Begins an MD5 operation, writing a new context.  
  */   */
 PA_API_EXPORT(void) PA_MD5Init(PA_MD5_CTX *context)  void pa_MD5Init(PA_MD5_CTX *ctx)
 {  {
     context->count[0] = context->count[1] = 0;          ctx->count = 0;
     /* Load magic initialization constants. */          ctx->state[0] = 0x67452301;
     context->state[0] = 0x67452301;          ctx->state[1] = 0xefcdab89;
     context->state[1] = 0xefcdab89;          ctx->state[2] = 0x98badcfe;
     context->state[2] = 0x98badcfe;          ctx->state[3] = 0x10325476;
     context->state[3] = 0x10325476;  
 }  }
   
 /* MD5 block update operation. Continues an MD5 message-digest  /*
    operation, processing another message block, and updating the   * Update context to reflect the concatenation of another buffer full
    context.   * of bytes.
  */   */
 PA_API_EXPORT(void) PA_MD5Update(PA_MD5_CTX *context, const unsigned char *input,  void pa_MD5Update(PA_MD5_CTX *ctx, const unsigned char *input, size_t len)
                               unsigned int inputLen)  
 {  {
     unsigned int i, idx, partLen;          size_t have, need;
   
     /* Compute number of bytes mod 64 */  
     idx = (unsigned int) ((context->count[0] >> 3) & 0x3F);  
   
     /* Update number of bits */          /* Check how many bytes we already have and how many more we need. */
     if ((context->count[0] += ((UINT4) inputLen << 3))          have = (size_t)((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1));
         < ((UINT4) inputLen << 3)) {          need = MD5_BLOCK_LENGTH - have;
         context->count[1]++;  
     }          /* Update bitcount */
     context->count[1] += (UINT4) inputLen >> 29;          ctx->count += (uint64_t)len << 3;
   
     partLen = 64 - idx;          if (len >= need) {
                   if (have != 0) {
     /* Transform as many times as possible. */                          memcpy(ctx->buffer + have, input, need);
 #ifndef CHARSET_EBCDIC                          pa_MD5Transform(ctx->state, ctx->buffer);
     if (inputLen >= partLen) {                          input += need;
         memcpy(&context->buffer[idx], input, partLen);                          len -= need;
         MD5Transform(context->state, context->buffer);                          have = 0;
                   }
         for (i = partLen; i + 63 < inputLen; i += 64) {  
             MD5Transform(context->state, &input[i]);                  /* Process data in MD5_BLOCK_LENGTH-byte chunks. */
         }                  while (len >= MD5_BLOCK_LENGTH) {
                           pa_MD5Transform(ctx->state, input);
         idx = 0;                          input += MD5_BLOCK_LENGTH;
     }                          len -= MD5_BLOCK_LENGTH;
     else {                  }
         i = 0;  
     }  
   
     /* Buffer remaining input */  
     memcpy(&context->buffer[idx], &input[i], inputLen - i);  
 #else /*CHARSET_EBCDIC*/  
     if (inputLen >= partLen) {  
         ebcdic2ascii(&context->buffer[idx], input, partLen);  
         MD5Transform(context->state, context->buffer);  
   
         for (i = partLen; i + 63 < inputLen; i += 64) {  
             unsigned char inp_tmp[64];  
             ebcdic2ascii(inp_tmp, &input[i], 64);  
             MD5Transform(context->state, inp_tmp);  
         }          }
   
         idx = 0;          /* Handle any remaining bytes of data. */
     }          if (len != 0)
     else {                  memcpy(ctx->buffer + have, input, len);
         i = 0;  
     }  
   
     /* Buffer remaining input */  
     ebcdic2ascii(&context->buffer[idx], &input[i], inputLen - i);  
 #endif /*CHARSET_EBCDIC*/  
 }  }
   
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the  /*
    the message digest and zeroizing the context.   * Pad pad to 64-byte boundary with the bit pattern
    * 1 0* (64-bit count of bits processed, MSB-first)
  */   */
 PA_API_EXPORT(void) PA_MD5Final(unsigned char digest[16], PA_MD5_CTX *context)  void pa_MD5Pad(PA_MD5_CTX *ctx)
 {  {
     unsigned char bits[8];          uint8_t count[8];
     unsigned int idx, padLen;          size_t padlen;
   
   
     /* Save number of bits */          /* Convert count to 8 bytes in little endian order. */
     Encode(bits, context->count, 8);          PUT_64BIT_LE(count, ctx->count);
   
 #ifdef CHARSET_EBCDIC  
     /* XXX: @@@: In order to make this no more complex than necessary,  
      * this kludge converts the bits[] array using the ascii-to-ebcdic  
      * table, because the following PA_MD5Update() re-translates  
      * its input (ebcdic-to-ascii).  
      * Otherwise, we would have to pass a "conversion" flag to PA_MD5Update()  
      */  
     ascii2ebcdic(bits,bits,8);  
   
     /* Since everything is converted to ascii within PA_MD5Update(),   
      * the initial 0x80 (PADDING[0]) must be stored as 0x20   
      */  
     PADDING[0] = os_toebcdic[0x80];  
 #endif /*CHARSET_EBCDIC*/  
   
     /* Pad out to 56 mod 64. */          /* Pad out to 56 mod 64. */
     idx = (unsigned int) ((context->count[0] >> 3) & 0x3f);          padlen = MD5_BLOCK_LENGTH -
     padLen = (idx < 56) ? (56 - idx) : (120 - idx);              ((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1));
     PA_MD5Update(context, (const unsigned char *)PADDING, padLen);          if (padlen < 1 + 8)
                   padlen += MD5_BLOCK_LENGTH;
     /* Append length (before padding) */          pa_MD5Update(ctx, PADDING, padlen - 8);         /* padlen - 8 <= 64 */
     PA_MD5Update(context, (const unsigned char *)bits, 8);          pa_MD5Update(ctx, count, 8);
   
     /* Store state in digest */  
     Encode(digest, context->state, 16);  
   
     /* Zeroize sensitive information. */  
     memset(context, 0, sizeof(*context));  
 }  }
   
 /* MD5 basic transformation. Transforms state based on block. */  /*
 static void MD5Transform(UINT4 state[4], const unsigned char block[64])   * Final wrapup--call MD5Pad, fill in digest and zero out ctx.
    */
   void pa_MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], PA_MD5_CTX *ctx)
 {  {
     UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];          int i;
   
     Decode(x, block, 64);          pa_MD5Pad(ctx);
           if (digest != NULL) {
     /* Round 1 */                  for (i = 0; i < 4; i++)
     FF(a, b, c, d, x[0], S11, 0xd76aa478);      /* 1 */                          PUT_32BIT_LE(digest + i * 4, ctx->state[i]);
     FF(d, a, b, c, x[1], S12, 0xe8c7b756);      /* 2 */                  memset(ctx, 0, sizeof(*ctx));
     FF(c, d, a, b, x[2], S13, 0x242070db);      /* 3 */          }
     FF(b, c, d, a, x[3], S14, 0xc1bdceee);      /* 4 */  
     FF(a, b, c, d, x[4], S11, 0xf57c0faf);      /* 5 */  
     FF(d, a, b, c, x[5], S12, 0x4787c62a);      /* 6 */  
     FF(c, d, a, b, x[6], S13, 0xa8304613);      /* 7 */  
     FF(b, c, d, a, x[7], S14, 0xfd469501);      /* 8 */  
     FF(a, b, c, d, x[8], S11, 0x698098d8);      /* 9 */  
     FF(d, a, b, c, x[9], S12, 0x8b44f7af);      /* 10 */  
     FF(c, d, a, b, x[10], S13, 0xffff5bb1);     /* 11 */  
     FF(b, c, d, a, x[11], S14, 0x895cd7be);     /* 12 */  
     FF(a, b, c, d, x[12], S11, 0x6b901122);     /* 13 */  
     FF(d, a, b, c, x[13], S12, 0xfd987193);     /* 14 */  
     FF(c, d, a, b, x[14], S13, 0xa679438e);     /* 15 */  
     FF(b, c, d, a, x[15], S14, 0x49b40821);     /* 16 */  
   
     /* Round 2 */  
     GG(a, b, c, d, x[1], S21, 0xf61e2562);      /* 17 */  
     GG(d, a, b, c, x[6], S22, 0xc040b340);      /* 18 */  
     GG(c, d, a, b, x[11], S23, 0x265e5a51);     /* 19 */  
     GG(b, c, d, a, x[0], S24, 0xe9b6c7aa);      /* 20 */  
     GG(a, b, c, d, x[5], S21, 0xd62f105d);      /* 21 */  
     GG(d, a, b, c, x[10], S22, 0x2441453);      /* 22 */  
     GG(c, d, a, b, x[15], S23, 0xd8a1e681);     /* 23 */  
     GG(b, c, d, a, x[4], S24, 0xe7d3fbc8);      /* 24 */  
     GG(a, b, c, d, x[9], S21, 0x21e1cde6);      /* 25 */  
     GG(d, a, b, c, x[14], S22, 0xc33707d6);     /* 26 */  
     GG(c, d, a, b, x[3], S23, 0xf4d50d87);      /* 27 */  
     GG(b, c, d, a, x[8], S24, 0x455a14ed);      /* 28 */  
     GG(a, b, c, d, x[13], S21, 0xa9e3e905);     /* 29 */  
     GG(d, a, b, c, x[2], S22, 0xfcefa3f8);      /* 30 */  
     GG(c, d, a, b, x[7], S23, 0x676f02d9);      /* 31 */  
     GG(b, c, d, a, x[12], S24, 0x8d2a4c8a);     /* 32 */  
   
     /* Round 3 */  
     HH(a, b, c, d, x[5], S31, 0xfffa3942);      /* 33 */  
     HH(d, a, b, c, x[8], S32, 0x8771f681);      /* 34 */  
     HH(c, d, a, b, x[11], S33, 0x6d9d6122);     /* 35 */  
     HH(b, c, d, a, x[14], S34, 0xfde5380c);     /* 36 */  
     HH(a, b, c, d, x[1], S31, 0xa4beea44);      /* 37 */  
     HH(d, a, b, c, x[4], S32, 0x4bdecfa9);      /* 38 */  
     HH(c, d, a, b, x[7], S33, 0xf6bb4b60);      /* 39 */  
     HH(b, c, d, a, x[10], S34, 0xbebfbc70);     /* 40 */  
     HH(a, b, c, d, x[13], S31, 0x289b7ec6);     /* 41 */  
     HH(d, a, b, c, x[0], S32, 0xeaa127fa);      /* 42 */  
     HH(c, d, a, b, x[3], S33, 0xd4ef3085);      /* 43 */  
     HH(b, c, d, a, x[6], S34, 0x4881d05);       /* 44 */  
     HH(a, b, c, d, x[9], S31, 0xd9d4d039);      /* 45 */  
     HH(d, a, b, c, x[12], S32, 0xe6db99e5);     /* 46 */  
     HH(c, d, a, b, x[15], S33, 0x1fa27cf8);     /* 47 */  
     HH(b, c, d, a, x[2], S34, 0xc4ac5665);      /* 48 */  
   
     /* Round 4 */  
     II(a, b, c, d, x[0], S41, 0xf4292244);      /* 49 */  
     II(d, a, b, c, x[7], S42, 0x432aff97);      /* 50 */  
     II(c, d, a, b, x[14], S43, 0xab9423a7);     /* 51 */  
     II(b, c, d, a, x[5], S44, 0xfc93a039);      /* 52 */  
     II(a, b, c, d, x[12], S41, 0x655b59c3);     /* 53 */  
     II(d, a, b, c, x[3], S42, 0x8f0ccc92);      /* 54 */  
     II(c, d, a, b, x[10], S43, 0xffeff47d);     /* 55 */  
     II(b, c, d, a, x[1], S44, 0x85845dd1);      /* 56 */  
     II(a, b, c, d, x[8], S41, 0x6fa87e4f);      /* 57 */  
     II(d, a, b, c, x[15], S42, 0xfe2ce6e0);     /* 58 */  
     II(c, d, a, b, x[6], S43, 0xa3014314);      /* 59 */  
     II(b, c, d, a, x[13], S44, 0x4e0811a1);     /* 60 */  
     II(a, b, c, d, x[4], S41, 0xf7537e82);      /* 61 */  
     II(d, a, b, c, x[11], S42, 0xbd3af235);     /* 62 */  
     II(c, d, a, b, x[2], S43, 0x2ad7d2bb);      /* 63 */  
     II(b, c, d, a, x[9], S44, 0xeb86d391);      /* 64 */  
   
     state[0] += a;  
     state[1] += b;  
     state[2] += c;  
     state[3] += d;  
   
     /* Zeroize sensitive information. */  
     memset(x, 0, sizeof(x));  
 }  }
   
 /* Encodes input (UINT4) into output (unsigned char). Assumes len is  
    a multiple of 4.  
  */  
 static void Encode(unsigned char *output, const UINT4 *input, unsigned int len)  
 {  
     unsigned int i, j;  
     UINT4 k;  
   
     for (i = 0, j = 0; j < len; i++, j += 4) {  /* The four core functions - F1 is optimized somewhat */
         k = input[i];  
         output[j] = (unsigned char) (k & 0xff);  /* #define F1(x, y, z) (x & y | ~x & z) */
         output[j + 1] = (unsigned char) ((k >> 8) & 0xff);  #define F1(x, y, z) (z ^ (x & (y ^ z)))
         output[j + 2] = (unsigned char) ((k >> 16) & 0xff);  #define F2(x, y, z) F1(z, x, y)
         output[j + 3] = (unsigned char) ((k >> 24) & 0xff);  #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, data, s) \
           ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
   
 /* Decodes input (unsigned char) into output (UINT4). Assumes len is  /*
  * a multiple of 4.   * 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.
  */   */
 static void Decode(UINT4 *output, const unsigned char *input, unsigned int len)  void pa_MD5Transform(uint32_t state[4], const uint8_t block[MD5_BLOCK_LENGTH])
 {  {
     unsigned int i, j;          uint32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4];
   
   #ifndef WORDS_BIGENDIAN
           memcpy(in, block, sizeof(in));
   #else
           for (a = 0; a < MD5_BLOCK_LENGTH / 4; a++) {
                   in[a] = (uint32_t)(
                       (uint32_t)(block[a * 4 + 0]) |
                       (uint32_t)(block[a * 4 + 1]) <<  8 |
                       (uint32_t)(block[a * 4 + 2]) << 16 |
                       (uint32_t)(block[a * 4 + 3]) << 24);
           }
   #endif
   
     for (i = 0, j = 0; j < len; i++, j += 4)          a = state[0];
         output[i] = ((UINT4) input[j]) | (((UINT4) input[j + 1]) << 8) |          b = state[1];
             (((UINT4) input[j + 2]) << 16) | (((UINT4) input[j + 3]) << 24);          c = state[2];
           d = state[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);
   
           state[0] += a;
           state[1] += b;
           state[2] += c;
           state[3] += d;
 }  }
   
 /*  /*
Line 420  static void Decode(UINT4 *output, const Line 263  static void Decode(UINT4 *output, const
  * the FreeBSD 3.0 /usr/src/lib/libcrypt/crypt.c file, which is   * the FreeBSD 3.0 /usr/src/lib/libcrypt/crypt.c file, which is
  * licenced as stated at the top of this file.   * licenced as stated at the top of this file.
  */   */
 PA_API_EXPORT(void) pa_to64(char *s, unsigned long v, int n)  
   void pa_to64(char *s, unsigned long v, int n)
 {  {
     static unsigned char itoa64[] =         /* 0 ... 63 => ASCII - 64 */      static unsigned char itoa64[] =         /* 0 ... 63 => ASCII - 64 */
         "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";          "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
Line 431  PA_API_EXPORT(void) pa_to64(char *s, uns Line 275  PA_API_EXPORT(void) pa_to64(char *s, uns
     }      }
 }  }
   
 PA_API_EXPORT(void) PA_MD5Encode(const unsigned char *pw,  void pa_MD5Encode(const unsigned char *pw, const unsigned char *salt, char *result, size_t nbytes)
                               const unsigned char *salt,  
                               char *result, size_t nbytes)  
 {  {
     /*      /*
      * Minimum size is 8 bytes for salt, plus 1 for the trailing NUL,       * Minimum size is 8 bytes for salt, plus 1 for the trailing NUL,
Line 480  PA_API_EXPORT(void) PA_MD5Encode(const u Line 322  PA_API_EXPORT(void) PA_MD5Encode(const u
     /*      /*
      * 'Time to make the doughnuts..'       * 'Time to make the doughnuts..'
      */       */
     PA_MD5Init(&ctx);      pa_MD5Init(&ctx);
   
     pwlen = strlen((char *)pw);      pwlen = strlen((char *)pw);
     /*      /*
      * The password first, since that is what is most unknown       * The password first, since that is what is most unknown
      */       */
     PA_MD5Update(&ctx, pw, pwlen);      pa_MD5Update(&ctx, pw, pwlen);
   
     /*      /*
      * Then our magic string       * Then our magic string
      */       */
     PA_MD5Update(&ctx, (const unsigned char *) PA_MD5PW_ID, PA_MD5PW_IDLEN);      pa_MD5Update(&ctx, (const unsigned char *) PA_MD5PW_ID, PA_MD5PW_IDLEN);
   
     /*      /*
      * Then the raw salt       * Then the raw salt
      */       */
     PA_MD5Update(&ctx, sp, sl);      pa_MD5Update(&ctx, sp, sl);
   
     /*      /*
      * Then just as many characters of the MD5(pw, salt, pw)       * Then just as many characters of the MD5(pw, salt, pw)
      */       */
     PA_MD5Init(&ctx1);      pa_MD5Init(&ctx1);
     PA_MD5Update(&ctx1, pw, pwlen);      pa_MD5Update(&ctx1, pw, pwlen);
     PA_MD5Update(&ctx1, sp, sl);      pa_MD5Update(&ctx1, sp, sl);
     PA_MD5Update(&ctx1, pw, pwlen);      pa_MD5Update(&ctx1, pw, pwlen);
     PA_MD5Final(final, &ctx1);      pa_MD5Final(final, &ctx1);
     for(pl = pwlen; pl > 0; pl -= 16) {      for(pl = pwlen; pl > 0; pl -= 16) {
         PA_MD5Update(&ctx, final, (pl > 16) ? 16 : (unsigned int) pl);          pa_MD5Update(&ctx, final, (pl > 16) ? 16 : (unsigned int) pl);
     }      }
   
     /*      /*
Line 520  PA_API_EXPORT(void) PA_MD5Encode(const u Line 362  PA_API_EXPORT(void) PA_MD5Encode(const u
      */       */
     for (i = pwlen; i != 0; i >>= 1) {      for (i = pwlen; i != 0; i >>= 1) {
         if (i & 1) {          if (i & 1) {
             PA_MD5Update(&ctx, final, 1);              pa_MD5Update(&ctx, final, 1);
         }          }
         else {          else {
             PA_MD5Update(&ctx, pw, 1);              pa_MD5Update(&ctx, pw, 1);
         }          }
     }      }
   
Line 531  PA_API_EXPORT(void) PA_MD5Encode(const u Line 373  PA_API_EXPORT(void) PA_MD5Encode(const u
      * Now make the output string.  We know our limitations, so we       * Now make the output string.  We know our limitations, so we
      * can use the string routines without bounds checking.       * can use the string routines without bounds checking.
      */       */
     pa_pa_cpystrn(passwd, PA_MD5PW_ID, PA_MD5PW_IDLEN + 1);      strncpy(passwd, PA_MD5PW_ID, PA_MD5PW_IDLEN + 1);
     pa_pa_cpystrn(passwd + PA_MD5PW_IDLEN, (char *)sp, sl + 1);      strncpy(passwd + PA_MD5PW_IDLEN, (char *)sp, sl + 1);
     passwd[PA_MD5PW_IDLEN + sl]     = '$';      passwd[PA_MD5PW_IDLEN + sl]     = '$';
     passwd[PA_MD5PW_IDLEN + sl + 1] = '\0';      passwd[PA_MD5PW_IDLEN + sl + 1] = '\0';
   
     PA_MD5Final(final, &ctx);      pa_MD5Final(final, &ctx);
   
     /*      /*
      * And now, just to make sure things don't run too fast..       * And now, just to make sure things don't run too fast..
Line 544  PA_API_EXPORT(void) PA_MD5Encode(const u Line 386  PA_API_EXPORT(void) PA_MD5Encode(const u
      * need 30 seconds to build a 1000 entry dictionary...       * need 30 seconds to build a 1000 entry dictionary...
      */       */
     for (i = 0; i < 1000; i++) {      for (i = 0; i < 1000; i++) {
         PA_MD5Init(&ctx1);          pa_MD5Init(&ctx1);
         if (i & 1) {          if (i & 1) {
             PA_MD5Update(&ctx1, pw, pwlen);              pa_MD5Update(&ctx1, pw, pwlen);
         }          }
         else {          else {
             PA_MD5Update(&ctx1, final, 16);              pa_MD5Update(&ctx1, final, 16);
         }          }
         if (i % 3) {          if (i % 3) {
             PA_MD5Update(&ctx1, sp, sl);              pa_MD5Update(&ctx1, sp, sl);
         }          }
   
         if (i % 7) {          if (i % 7) {
             PA_MD5Update(&ctx1, pw, pwlen);              pa_MD5Update(&ctx1, pw, pwlen);
         }          }
   
         if (i & 1) {          if (i & 1) {
             PA_MD5Update(&ctx1, final, 16);              pa_MD5Update(&ctx1, final, 16);
         }          }
         else {          else {
             PA_MD5Update(&ctx1, pw, pwlen);              pa_MD5Update(&ctx1, pw, pwlen);
         }          }
         PA_MD5Final(final,&ctx1);          pa_MD5Final(final,&ctx1);
     }      }
   
     p = passwd + strlen(passwd);      p = passwd + strlen(passwd);
Line 583  PA_API_EXPORT(void) PA_MD5Encode(const u Line 425  PA_API_EXPORT(void) PA_MD5Encode(const u
      */       */
     memset(final, 0, sizeof(final));      memset(final, 0, sizeof(final));
   
     pa_pa_cpystrn(result, passwd, nbytes - 1);      strncpy(result, passwd, nbytes - 1);
 }  }

Removed from v.1.6.2.1.2.2  
changed lines
  Added in v.1.24


E-mail: