[BACK]Return to pa_md5c.c CVS log [TXT] [DIR] Up to [parser3project] / parser3 / src / lib / md5

Diff for /parser3/src/lib/md5/pa_md5c.c between versions 1.7 and 1.9

version 1.7, 2003/04/14 14:59:29 version 1.9, 2003/04/25 10:54:54
Line 1 Line 1
 /** @file  /** @file
         Parser: copied from apache 1.3.20  sources.          Parser: copied from apache 1.3.20  sources.
         Replaced ap_ to pa_ prefixes. linked into all targets but Apache-module target,          Replaced ap_ to PA_ prefixes. linked into all targets but Apache-module target,
         where linked targets/apache/pa_md5c.c stub instead.          where linked targets/apache/PA_md5c.c stub instead.
   
         Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)          Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 */  */
Line 97 Line 97
  */   */
   
 /*  /*
  * 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 112  static const char* IDENT_MD5_C="$Date$"; Line 112  static const char* IDENT_MD5_C="$Date$";
 #include <string.h>  #include <string.h>
   
 #include "pa_md5.h"  #include "pa_md5.h"
 //#include "ap.h"  
 //#ifdef CHARSET_EBCDIC  
 //#include "ebcdic.h"  
 //#endif /*CHARSET_EBCDIC*/  
 //#if HAVE_CRYPT_H  
 //#include <crypt.h>  
 //#endif  
   
 #define pa_cpystrn(strDest, strSource, count) strncpy(strDest, strSource, count)  #define PA_cpystrn(strDest, strSource, count) strncpy(strDest, strSource, count)
   
 /* Constants for MD5Transform routine.  /* Constants for MD5Transform routine.
  */   */
Line 192  static unsigned char PADDING[64] = Line 185  static unsigned char PADDING[64] =
   
 /* MD5 initialization. Begins an MD5 operation, writing a new context.  /* MD5 initialization. Begins an MD5 operation, writing a new context.
  */   */
 PA_API_EXPORT(void) pa_MD5Init(PA_MD5_CTX *context)  PA_API_EXPORT(void) PA_MD5Init(PA_MD5_CTX *context)
 {  {
     context->count[0] = context->count[1] = 0;      context->count[0] = context->count[1] = 0;
     /* Load magic initialization constants. */      /* Load magic initialization constants. */
Line 206  PA_API_EXPORT(void) pa_MD5Init(PA_MD5_CT Line 199  PA_API_EXPORT(void) pa_MD5Init(PA_MD5_CT
    operation, processing another message block, and updating the     operation, processing another message block, and updating the
    context.     context.
  */   */
 PA_API_EXPORT(void) pa_MD5Update(PA_MD5_CTX *context, const unsigned char *input,  PA_API_EXPORT(void) PA_MD5Update(PA_MD5_CTX *context, const unsigned char *input,
                               unsigned int inputLen)                                unsigned int inputLen)
 {  {
     unsigned int i, idx, partLen;      unsigned int i, idx, partLen;
Line 266  PA_API_EXPORT(void) pa_MD5Update(PA_MD5_ Line 259  PA_API_EXPORT(void) pa_MD5Update(PA_MD5_
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the  /* MD5 finalization. Ends an MD5 message-digest operation, writing the
    the message digest and zeroizing the context.     the message digest and zeroizing the context.
  */   */
 PA_API_EXPORT(void) pa_MD5Final(unsigned char digest[16], PA_MD5_CTX *context)  PA_API_EXPORT(void) PA_MD5Final(unsigned char digest[16], PA_MD5_CTX *context)
 {  {
     unsigned char bits[8];      unsigned char bits[8];
     unsigned int idx, padLen;      unsigned int idx, padLen;
Line 278  PA_API_EXPORT(void) pa_MD5Final(unsigned Line 271  PA_API_EXPORT(void) pa_MD5Final(unsigned
 #ifdef CHARSET_EBCDIC  #ifdef CHARSET_EBCDIC
     /* XXX: @@@: In order to make this no more complex than necessary,      /* XXX: @@@: In order to make this no more complex than necessary,
      * this kludge converts the bits[] array using the ascii-to-ebcdic       * this kludge converts the bits[] array using the ascii-to-ebcdic
      * table, because the following pa_MD5Update() re-translates       * table, because the following PA_MD5Update() re-translates
      * its input (ebcdic-to-ascii).       * its input (ebcdic-to-ascii).
      * Otherwise, we would have to pass a "conversion" flag to pa_MD5Update()       * Otherwise, we would have to pass a "conversion" flag to PA_MD5Update()
      */       */
     ascii2ebcdic(bits,bits,8);      ascii2ebcdic(bits,bits,8);
   
     /* Since everything is converted to ascii within pa_MD5Update(),       /* Since everything is converted to ascii within PA_MD5Update(), 
      * the initial 0x80 (PADDING[0]) must be stored as 0x20        * the initial 0x80 (PADDING[0]) must be stored as 0x20 
      */       */
     PADDING[0] = os_toebcdic[0x80];      PADDING[0] = os_toebcdic[0x80];
Line 293  PA_API_EXPORT(void) pa_MD5Final(unsigned Line 286  PA_API_EXPORT(void) pa_MD5Final(unsigned
     /* Pad out to 56 mod 64. */      /* Pad out to 56 mod 64. */
     idx = (unsigned int) ((context->count[0] >> 3) & 0x3f);      idx = (unsigned int) ((context->count[0] >> 3) & 0x3f);
     padLen = (idx < 56) ? (56 - idx) : (120 - idx);      padLen = (idx < 56) ? (56 - idx) : (120 - idx);
     pa_MD5Update(context, (const unsigned char *)PADDING, padLen);      PA_MD5Update(context, (const unsigned char *)PADDING, padLen);
   
     /* Append length (before padding) */      /* Append length (before padding) */
     pa_MD5Update(context, (const unsigned char *)bits, 8);      PA_MD5Update(context, (const unsigned char *)bits, 8);
   
     /* Store state in digest */      /* Store state in digest */
     Encode(digest, context->state, 16);      Encode(digest, context->state, 16);
Line 427  static void Decode(UINT4 *output, const Line 420  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)  PA_API_EXPORT(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 438  PA_API_EXPORT(void) pa_to64(char *s, uns Line 431  PA_API_EXPORT(void) pa_to64(char *s, uns
     }      }
 }  }
   
 PA_API_EXPORT(void) pa_MD5Encode(const unsigned char *pw,  PA_API_EXPORT(void) PA_MD5Encode(const unsigned char *pw,
                               const unsigned char *salt, int mix_in_magic_string,                                const unsigned char *salt, int mix_in_magic_string,
                               char* result_base64, size_t result_base64_size,                                char* result_base64, size_t result_base64_size)
                               unsigned char* result_raw, size_t result_raw_size)  
 {  {
     /*      /*
      * 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 488  PA_API_EXPORT(void) pa_MD5Encode(const u Line 480  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);
   
     if(mix_in_magic_string) {      if(mix_in_magic_string) {
             /*              /*
              * 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 530  PA_API_EXPORT(void) pa_MD5Encode(const u Line 522  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 541  PA_API_EXPORT(void) pa_MD5Encode(const u Line 533  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_cpystrn(passwd, PA_MD5PW_ID, PA_MD5PW_IDLEN + 1);      PA_cpystrn(passwd, PA_MD5PW_ID, PA_MD5PW_IDLEN + 1);
     pa_cpystrn(passwd + PA_MD5PW_IDLEN, (char *)sp, sl + 1);      PA_cpystrn(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 554  PA_API_EXPORT(void) pa_MD5Encode(const u Line 546  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);
   
     l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; pa_to64(p, l, 4); p += 4;      l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; PA_to64(p, l, 4); p += 4;
     l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; pa_to64(p, l, 4); p += 4;      l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; PA_to64(p, l, 4); p += 4;
     l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; pa_to64(p, l, 4); p += 4;      l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; PA_to64(p, l, 4); p += 4;
     l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; pa_to64(p, l, 4); p += 4;      l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; PA_to64(p, l, 4); p += 4;
     l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; pa_to64(p, l, 4); p += 4;      l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; PA_to64(p, l, 4); p += 4;
     l =                    final[11]                ; pa_to64(p, l, 2); p += 2;      l =                    final[11]                ; PA_to64(p, l, 2); p += 2;
     *p = '\0';      *p = '\0';
   
     pa_cpystrn(result_base64, passwd, result_base64_size - 1);  
     if(result_raw)  
         memcpy(result_raw, final, result_raw_size);  
   
     /*      /*
      * Don't leave anything around in vm they could use.       * Don't leave anything around in vm they could use.
      */       */
     memset(final, 0, sizeof(final));      memset(final, 0, sizeof(final));
           
   
       PA_cpystrn(result_base64, passwd, result_base64_size - 1);
 }  }
Removed from v.1.7  
changed lines
  Added in v.1.9

E-mail: