apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-util/include apr_md5.h
Date Wed, 17 Jul 2002 02:53:26 GMT
wrowe       2002/07/16 19:53:26

  Modified:    .        apr.dsp libapr.dsp
               include  apr_lib.h
               passwd   Makefile.in
               .        aprutil.dsp libaprutil.dsp
               crypto   Makefile.in
  Added:       crypto   apr_md5.c
               include  apr_md5.h
  Removed:     include  apr_md5.h
               passwd   apr_md5.c
  Log:
    MD5 is crypto.  It belongs in crypto.  And as far as I can tell, this
    didn't even cause any hassles.
  
  Revision  Changes    Path
  1.108     +0 -8      apr/apr.dsp
  
  Index: apr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/apr.dsp,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- apr.dsp	11 Jul 2002 15:32:17 -0000	1.107
  +++ apr.dsp	17 Jul 2002 02:53:25 -0000	1.108
  @@ -301,10 +301,6 @@
   
   SOURCE=.\passwd\apr_getpass.c
   # End Source File
  -# Begin Source File
  -
  -SOURCE=.\passwd\apr_md5.c
  -# End Source File
   # End Group
   # Begin Group "shmem"
   
  @@ -538,10 +534,6 @@
   # Begin Source File
   
   SOURCE=.\include\apr_lib.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\include\apr_md5.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.69      +0 -8      apr/libapr.dsp
  
  Index: libapr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/libapr.dsp,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- libapr.dsp	11 Jul 2002 15:32:17 -0000	1.68
  +++ libapr.dsp	17 Jul 2002 02:53:25 -0000	1.69
  @@ -307,10 +307,6 @@
   
   SOURCE=.\passwd\apr_getpass.c
   # End Source File
  -# Begin Source File
  -
  -SOURCE=.\passwd\apr_md5.c
  -# End Source File
   # End Group
   # Begin Group "shmem"
   
  @@ -544,10 +540,6 @@
   # Begin Source File
   
   SOURCE=.\include\apr_lib.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\include\apr_md5.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.58      +0 -8      apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_lib.h,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- apr_lib.h	8 Jul 2002 17:34:24 -0000	1.57
  +++ apr_lib.h	17 Jul 2002 02:53:25 -0000	1.58
  @@ -236,14 +236,6 @@
   			        va_list ap);
   
   /**
  - * Validate any password encypted with any algorithm that APR understands
  - * @param passwd The password to validate
  - * @param hash The password to validate against
  - */
  -APR_DECLARE(apr_status_t) apr_password_validate(const char *passwd, 
  -                                                const char *hash);
  -
  -/**
    * Display a prompt and read in the password from stdin.
    * @param prompt The prompt to display
    * @param pwbuf Buffer to store the password
  
  
  
  1.7       +1 -1      apr/passwd/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/passwd/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	22 Apr 2002 01:24:50 -0000	1.6
  +++ Makefile.in	17 Jul 2002 02:53:25 -0000	1.7
  @@ -1,7 +1,7 @@
   srcdir = @srcdir@
   VPATH = @srcdir@
   
  -TARGETS = apr_md5.lo apr_getpass.lo
  +TARGETS = apr_getpass.lo
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.42      +8 -0      apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- aprutil.dsp	25 May 2002 16:25:08 -0000	1.41
  +++ aprutil.dsp	17 Jul 2002 02:53:25 -0000	1.42
  @@ -149,6 +149,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\crypto\apr_md5.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\crypto\apr_sha1.c
   # End Source File
   # End Group
  @@ -460,6 +464,10 @@
   # Begin Source File
   
   SOURCE=.\include\apr_md4.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_md5.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.36      +8 -0      apr-util/libaprutil.dsp
  
  Index: libaprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.dsp,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- libaprutil.dsp	25 May 2002 16:27:08 -0000	1.35
  +++ libaprutil.dsp	17 Jul 2002 02:53:26 -0000	1.36
  @@ -155,6 +155,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\crypto\apr_md5.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\crypto\apr_sha1.c
   # End Source File
   # End Group
  @@ -466,6 +470,10 @@
   # Begin Source File
   
   SOURCE=.\include\apr_md4.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_md5.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.13      +1 -1      apr-util/crypto/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/crypto/Makefile.in,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.in	8 May 2002 22:00:57 -0000	1.12
  +++ Makefile.in	17 Jul 2002 02:53:26 -0000	1.13
  @@ -2,7 +2,7 @@
   
   INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
   
  -TARGETS = apr_sha1.lo apr_md4.lo
  +TARGETS = apr_sha1.lo apr_md4.lo apr_md5.lo
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.1                  apr-util/crypto/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  /*
   * 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.
   */
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" 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 name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``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 SOFTWARE FOUNDATION 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 Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  /*
   * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
   * MD5 crypt() function, which is licenced as follows:
   * ----------------------------------------------------------------------------
   * "THE BEER-WARE LICENSE" (Revision 42):
   * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
   * can do whatever you want with this stuff. If we meet some day, and you think
   * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
   * ----------------------------------------------------------------------------
   */
  #ifndef WIN32
  #include "apr_private.h"
  #endif
  #include "apr_strings.h"
  #include "apr_md5.h"
  #include "apr_lib.h"
  
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #if APR_HAVE_CRYPT_H
  #include <crypt.h>
  #endif
  #if APR_HAVE_UNISTD_H
  #include <unistd.h>
  #endif
  
  /* Constants for MD5Transform routine.
   */
  
  #define S11 7
  #define S12 12
  #define S13 17
  #define S14 22
  #define S21 5
  #define S22 9
  #define S23 14
  #define S24 20
  #define S31 4
  #define S32 11
  #define S33 16
  #define S34 23
  #define S41 6
  #define S42 10
  #define S43 15
  #define S44 21
  
  static void MD5Transform(apr_uint32_t state[4], const unsigned char block[64]);
  static void Encode(unsigned char *output, const apr_uint32_t *input,
                     unsigned int len);
  static void Decode(apr_uint32_t *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
  };
  
  #if APR_CHARSET_EBCDIC
  static apr_xlate_t *xlate_ebcdic_to_ascii; /* used in apr_md5_encode() */
  #endif
  
  /* F, G, H and I are basic MD5 functions.
   */
  #define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
  #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) + (apr_uint32_t)(ac); \
   (a) = ROTATE_LEFT ((a), (s)); \
   (a) += (b); \
    }
  #define GG(a, b, c, d, x, s, ac) { \
   (a) += G ((b), (c), (d)) + (x) + (apr_uint32_t)(ac); \
   (a) = ROTATE_LEFT ((a), (s)); \
   (a) += (b); \
    }
  #define HH(a, b, c, d, x, s, ac) { \
   (a) += H ((b), (c), (d)) + (x) + (apr_uint32_t)(ac); \
   (a) = ROTATE_LEFT ((a), (s)); \
   (a) += (b); \
    }
  #define II(a, b, c, d, x, s, ac) { \
   (a) += I ((b), (c), (d)) + (x) + (apr_uint32_t)(ac); \
   (a) = ROTATE_LEFT ((a), (s)); \
   (a) += (b); \
    }
  
  /* MD5 initialization. Begins an MD5 operation, writing a new context.
   */
  APU_DECLARE(apr_status_t) apr_md5_init(apr_md5_ctx_t *context)
  {
      context->count[0] = context->count[1] = 0;
      
      /* Load magic initialization constants. */
      context->state[0] = 0x67452301;
      context->state[1] = 0xefcdab89;
      context->state[2] = 0x98badcfe;
      context->state[3] = 0x10325476;
      context->xlate = NULL;
      
      return APR_SUCCESS;
  }
  
  /* MD5 translation setup.  Provides the APR translation handle
   * to be used for translating the content before calculating the
   * digest.
   */
  APU_DECLARE(apr_status_t) apr_md5_set_xlate(apr_md5_ctx_t *context, 
                                              apr_xlate_t *xlate)
  {
  #if APR_HAS_XLATE
      apr_status_t rv;
      int is_sb;
  
      /* TODO: remove the single-byte-only restriction from this code
       */
      rv = apr_xlate_sb_get(xlate, &is_sb);
      if (rv != APR_SUCCESS) {
          return rv;
      }
      if (!is_sb) {
          return APR_EINVAL;
      }
      context->xlate = xlate;
      return APR_SUCCESS;
  #else
      return APR_ENOTIMPL;
  #endif /* APR_HAS_XLATE */
  }
  
  /* MD5 block update operation. Continues an MD5 message-digest
   * operation, processing another message block, and updating the
   * context.
   */
  APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
                                           const unsigned char *input,
                                           apr_size_t inputLen)
  {
      unsigned int i, idx, partLen;
  #if APR_HAS_XLATE
      apr_size_t inbytes_left, outbytes_left;
  #endif
  
      /* Compute number of bytes mod 64 */
      idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
  
      /* Update number of bits */
      if ((context->count[0] += ((apr_uint32_t)inputLen << 3)) 
              < ((apr_uint32_t)inputLen << 3))
          context->count[1]++;
      context->count[1] += (apr_uint32_t)inputLen >> 29;
  
      partLen = 64 - idx;
  
      /* Transform as many times as possible. */
  #if !APR_HAS_XLATE
      if (inputLen >= partLen) {
          memcpy(&context->buffer[idx], input, partLen);
          MD5Transform(context->state, context->buffer);
  
          for (i = partLen; i + 63 < inputLen; i += 64)
              MD5Transform(context->state, &input[i]);
  
          idx = 0;
      }
      else
          i = 0;
  
      /* Buffer remaining input */
      memcpy(&context->buffer[idx], &input[i], inputLen - i);
  #else /*APR_HAS_XLATE*/
      if (inputLen >= partLen) {
          if (context->xlate) {
              inbytes_left = outbytes_left = partLen;
              apr_xlate_conv_buffer(context->xlate, (const char *)input, 
                                    &inbytes_left,
                                    (char *)&context->buffer[idx], 
                                    &outbytes_left);
          }
          else {
              memcpy(&context->buffer[idx], input, partLen);
          }
          MD5Transform(context->state, context->buffer);
  
          for (i = partLen; i + 63 < inputLen; i += 64) {
              if (context->xlate) {
                  unsigned char inp_tmp[64];
                  inbytes_left = outbytes_left = 64;
                  apr_xlate_conv_buffer(context->xlate, (const char *)&input[i], 
                                        &inbytes_left, (char *)inp_tmp, 
                                        &outbytes_left);
                  MD5Transform(context->state, inp_tmp);
              }
              else {
                  MD5Transform(context->state, &input[i]);
              }
          }
  
          idx = 0;
      }
      else
          i = 0;
  
      /* Buffer remaining input */
      if (context->xlate) {
          inbytes_left = outbytes_left = inputLen - i;
          apr_xlate_conv_buffer(context->xlate, (const char *)&input[i], 
                                &inbytes_left, (char *)&context->buffer[idx], 
                                &outbytes_left);
      }
      else {
          memcpy(&context->buffer[idx], &input[i], inputLen - i);
      }
  #endif /*APR_HAS_XLATE*/
      return APR_SUCCESS;
  }
  
  /* MD5 finalization. Ends an MD5 message-digest operation, writing the
   * the message digest and zeroizing the context.
   */
  APU_DECLARE(apr_status_t) apr_md5_final(unsigned char digest[MD5_DIGESTSIZE],
                                          apr_md5_ctx_t *context)
  {
      unsigned char bits[8];
      unsigned int idx, padLen;
  
      /* Save number of bits */
      Encode(bits, context->count, 8);
  
  #if APR_HAS_XLATE
      /* apr_md5_update() should not translate for this final round. */
      context->xlate = NULL;
  #endif /*APR_HAS_XLATE*/
  
      /* Pad out to 56 mod 64. */
      idx = (unsigned int)((context->count[0] >> 3) & 0x3f);
      padLen = (idx < 56) ? (56 - idx) : (120 - idx);
      apr_md5_update(context, PADDING, padLen);
  
      /* Append length (before padding) */
      apr_md5_update(context, bits, 8);
  
      /* Store state in digest */
      Encode(digest, context->state, MD5_DIGESTSIZE);
  
      /* Zeroize sensitive information. */
      memset(context, 0, sizeof(*context));
      
      return APR_SUCCESS;
  }
  
  /* MD5 in one step (init, update, final)
   */
  APU_DECLARE(apr_status_t) apr_md5(unsigned char digest[MD5_DIGESTSIZE],
                                    const unsigned char *input,
                                    apr_size_t inputLen)
  {
      apr_md5_ctx_t ctx;
      apr_status_t rv;
  
      apr_md5_init(&ctx);
  
      if ((rv = apr_md5_update(&ctx, input, inputLen)) != APR_SUCCESS)
          return rv;
  
      return apr_md5_final(digest, &ctx);
  }
  
  /* MD5 basic transformation. Transforms state based on block. */
  static void MD5Transform(apr_uint32_t state[4], const unsigned char block[64])
  {
      apr_uint32_t a = state[0], b = state[1], c = state[2], d = state[3],
                   x[MD5_DIGESTSIZE];
  
      Decode(x, block, 64);
  
      /* Round 1 */
      FF(a, b, c, d, x[0],  S11, 0xd76aa478); /* 1 */
      FF(d, a, b, c, x[1],  S12, 0xe8c7b756); /* 2 */
      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 (apr_uint32_t) into output (unsigned char). Assumes len is
   * a multiple of 4.
   */
  static void Encode(unsigned char *output, const apr_uint32_t *input,
                     unsigned int len)
  {
      unsigned int i, j;
      apr_uint32_t k;
  
      for (i = 0, j = 0; j < len; i++, j += 4) {
          k = input[i];
          output[j]     = (unsigned char)(k & 0xff);
          output[j + 1] = (unsigned char)((k >> 8) & 0xff);
          output[j + 2] = (unsigned char)((k >> 16) & 0xff);
          output[j + 3] = (unsigned char)((k >> 24) & 0xff);
      }
  }
  
  /* Decodes input (unsigned char) into output (apr_uint32_t). Assumes len is
   * a multiple of 4.
   */
  static void Decode(apr_uint32_t *output, const unsigned char *input,
                     unsigned int len)
  {
      unsigned int i, j;
  
      for (i = 0, j = 0; j < len; i++, j += 4)
          output[i] = ((apr_uint32_t)input[j])             |
                      (((apr_uint32_t)input[j + 1]) << 8)  |
                      (((apr_uint32_t)input[j + 2]) << 16) |
                      (((apr_uint32_t)input[j + 3]) << 24);
  }
  
  #if APR_CHARSET_EBCDIC
  APU_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
  {
      xlate_ebcdic_to_ascii = xlate;
      return APR_SUCCESS;
  }
  #endif
  
  /*
   * Define the Magic String prefix that identifies a password as being
   * hashed using our algorithm.
   */
  static const char *apr1_id = "$apr1$";
  
  /*
   * The following MD5 password encryption code was largely borrowed from
   * the FreeBSD 3.0 /usr/src/lib/libcrypt/crypt.c file, which is
   * licenced as stated at the top of this file.
   */
  
  static void to64(char *s, unsigned long v, int n)
  {
      static unsigned char itoa64[] =         /* 0 ... 63 => ASCII - 64 */
          "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
  
      while (--n >= 0) {
          *s++ = itoa64[v&0x3f];
          v >>= 6;
      }
  }
  
  APU_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
                               char *result, apr_size_t nbytes)
  {
      /*
       * Minimum size is 8 bytes for salt, plus 1 for the trailing NUL,
       * plus 4 for the '$' separators, plus the password hash itself.
       * Let's leave a goodly amount of leeway.
       */
  
      char passwd[120], *p;
      const char *sp, *ep;
      unsigned char final[MD5_DIGESTSIZE];
      apr_ssize_t sl, pl, i;
      apr_md5_ctx_t ctx, ctx1;
      unsigned long l;
  
      /* 
       * Refine the salt first.  It's possible we were given an already-hashed
       * string as the salt argument, so extract the actual salt value from it
       * if so.  Otherwise just use the string up to the first '$' as the salt.
       */
      sp = salt;
  
      /*
       * If it starts with the magic string, then skip that.
       */
      if (!strncmp(sp, apr1_id, strlen(apr1_id))) {
          sp += strlen(apr1_id);
      }
  
      /*
       * It stops at the first '$' or 8 chars, whichever comes first
       */
      for (ep = sp; (*ep != '\0') && (*ep != '$') && (ep < (sp + 8)); ep++)
{
          continue;
      }
  
      /*
       * Get the length of the true salt
       */
      sl = ep - sp;
  
      /*
       * 'Time to make the doughnuts..'
       */
      apr_md5_init(&ctx);
  #if APR_CHARSET_EBCDIC
      apr_md5_set_xlate(&ctx, xlate_ebcdic_to_ascii);
  #endif
      
      /*
       * The password first, since that is what is most unknown
       */
      apr_md5_update(&ctx, (unsigned char *)pw, strlen(pw));
  
      /*
       * Then our magic string
       */
      apr_md5_update(&ctx, (unsigned char *)apr1_id, strlen(apr1_id));
  
      /*
       * Then the raw salt
       */
      apr_md5_update(&ctx, (unsigned char *)sp, sl);
  
      /*
       * Then just as many characters of the MD5(pw, salt, pw)
       */
      apr_md5_init(&ctx1);
      apr_md5_update(&ctx1, (unsigned char *)pw, strlen(pw));
      apr_md5_update(&ctx1, (unsigned char *)sp, sl);
      apr_md5_update(&ctx1, (unsigned char *)pw, strlen(pw));
      apr_md5_final(final, &ctx1);
      for (pl = strlen(pw); pl > 0; pl -= MD5_DIGESTSIZE) {
          apr_md5_update(&ctx, final, 
                        (pl > MD5_DIGESTSIZE) ? MD5_DIGESTSIZE : pl);
      }
  
      /*
       * Don't leave anything around in vm they could use.
       */
      memset(final, 0, sizeof(final));
  
      /*
       * Then something really weird...
       */
      for (i = strlen(pw); i != 0; i >>= 1) {
          if (i & 1) {
              apr_md5_update(&ctx, final, 1);
          }
          else {
              apr_md5_update(&ctx, (unsigned char *)pw, 1);
          }
      }
  
      /*
       * Now make the output string.  We know our limitations, so we
       * can use the string routines without bounds checking.
       */
      strcpy(passwd, apr1_id);
      strncat(passwd, sp, sl);
      strcat(passwd, "$");
  
      apr_md5_final(final, &ctx);
  
      /*
       * And now, just to make sure things don't run too fast..
       * On a 60 Mhz Pentium this takes 34 msec, so you would
       * need 30 seconds to build a 1000 entry dictionary...
       */
      for (i = 0; i < 1000; i++) {
          apr_md5_init(&ctx1);
          if (i & 1) {
              apr_md5_update(&ctx1, (unsigned char *)pw, strlen(pw));
          }
          else {
              apr_md5_update(&ctx1, final, MD5_DIGESTSIZE);
          }
          if (i % 3) {
              apr_md5_update(&ctx1, (unsigned char *)sp, sl);
          }
  
          if (i % 7) {
              apr_md5_update(&ctx1, (unsigned char *)pw, strlen(pw));
          }
  
          if (i & 1) {
              apr_md5_update(&ctx1, final, MD5_DIGESTSIZE);
          }
          else {
              apr_md5_update(&ctx1, (unsigned char *)pw, strlen(pw));
          }
          apr_md5_final(final,&ctx1);
      }
  
      p = passwd + strlen(passwd);
  
      l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p, l, 4); p += 4;
      l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p, l, 4); p += 4;
      l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p, l, 4); p += 4;
      l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p, l, 4); p += 4;
      l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p, l, 4); p += 4;
      l =                    final[11]                ; to64(p, l, 2); p += 2;
      *p = '\0';
  
      /*
       * Don't leave anything around in vm they could use.
       */
      memset(final, 0, sizeof(final));
  
      apr_cpystrn(result, passwd, nbytes - 1);
      return APR_SUCCESS;
  }
  
  /*
   * Validate a plaintext password against a smashed one.  Use either
   * crypt() (if available) or apr_md5_encode(), depending upon the format
   * of the smashed input password.  Return APR_SUCCESS if they match, or
   * APR_EMISMATCH if they don't.
   */
  
  APU_DECLARE(apr_status_t) apr_password_validate(const char *passwd, 
                                                  const char *hash)
  {
      char sample[120];
  #if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
      char *crypt_pw;
  #endif
      if (!strncmp(hash, apr1_id, strlen(apr1_id))) {
          /*
           * The hash was created using our custom algorithm.
           */
          apr_md5_encode(passwd, hash, sample, sizeof(sample));
      }
      else {
          /*
           * It's not our algorithm, so feed it to crypt() if possible.
           */
  #if defined(WIN32) || defined(BEOS) || defined(NETWARE)
          apr_cpystrn(sample, passwd, sizeof(sample) - 1);
  #elif defined(CRYPT_R_CRYPTD)
          CRYPTD buffer;
  
          crypt_pw = crypt_r(passwd, hash, &buffer);
          apr_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
  #elif defined(CRYPT_R_STRUCT_CRYPT_DATA)
          struct crypt_data buffer;
  
          /* having to clear this seems bogus... GNU doc is
           * confusing...  user report found from google says
           * the crypt_data struct had to be cleared to get
           * the same result as plain crypt()
           */
          memset(&buffer, 0, sizeof(buffer));
          crypt_pw = crypt_r(passwd, hash, &buffer);
          apr_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
  #else
          /* XXX if this is a threaded build, we should hold a mutex 
           *     around the next two lines... but note that on some
           *     platforms (e.g., Solaris, HP-UX, OS/390) crypt() 
           *     returns a pointer to thread-specific data so we don't
           *     want a mutex on those platforms
           */
          crypt_pw = crypt(passwd, hash);
          apr_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
  #endif
      }
      return (strcmp(sample, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH;
  }
  
  
  
  1.1                  apr-util/include/apr_md5.h
  
  Index: apr_md5.h
  ===================================================================
  /*
   * 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.
   */
  
  /* 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.
   */
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" 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 name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``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 SOFTWARE FOUNDATION 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 Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #ifndef APR_MD5_H
  #define APR_MD5_H
  
  #include "apu.h"
  #include "apr_xlate.h"
  
  #ifdef __cplusplus
  extern "C" {
  #endif
  /**
   * @file apr_md5.h
   * @brief APR MD5 Routines
   */
  
  /**
   * @defgroup APR_MD5 MD5 Routines
   * @ingroup APR
   * @{
   */
  
  #define MD5_DIGESTSIZE 16
  
  typedef struct apr_md5_ctx_t apr_md5_ctx_t;
  
  /** MD5 context. */
  struct apr_md5_ctx_t {
      /** state (ABCD) */
      apr_uint32_t state[4];
      /** number of bits, modulo 2^64 (lsb first) */
      apr_uint32_t count[2];
      /** input buffer */
      unsigned char buffer[64];
      /** translation handle 
       *  ignored if xlate is unsupported
       */
      apr_xlate_t *xlate;
  };
  
  /**
   * MD5 Initialize.  Begins an MD5 operation, writing a new context.
   * @param context The MD5 context to initialize.
   */
  APU_DECLARE(apr_status_t) apr_md5_init(apr_md5_ctx_t *context);
  
  /**
   * MD5 translation setup.  Provides the APR translation handle to be used 
   * for translating the content before calculating the digest.
   * @param context The MD5 content to set the translation for.
   * @param xlate The translation handle to use for this MD5 context 
   */
  APU_DECLARE(apr_status_t) apr_md5_set_xlate(apr_md5_ctx_t *context,
                                              apr_xlate_t *xlate);
  
  /**
   * MD5 block update operation.  Continue an MD5 message-digest operation, 
   * processing another message block, and updating the context.
   * @param context The MD5 content to update.
   * @param input next message block to update
   * @param inputLen The length of the next message block
   */
  APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
                                           const unsigned char *input,
                                           apr_size_t inputLen);
  
  /**
   * MD5 finalization.  Ends an MD5 message-digest operation, writing the 
   * message digest and zeroing the context
   * @param digest The final MD5 digest
   * @param context The MD5 content we are finalizing.
   */
  APU_DECLARE(apr_status_t) apr_md5_final(unsigned char digest[MD5_DIGESTSIZE],
                                          apr_md5_ctx_t *context);
  
  /**
   * MD5 in one step
   * @param digest The final MD5 digest
   * @param input The message block to use
   * @param inputLen The length of the message block
   */
  APU_DECLARE(apr_status_t) apr_md5(unsigned char digest[MD5_DIGESTSIZE],
                                    const unsigned char *input,
                                    apr_size_t inputLen);
  
  /**
   * Encode a password using an MD5 algorithm
   * @param password The password to encode
   * @param salt The salt to use for the encoding
   * @param result The string to store the encoded password in
   * @param nbytes The length of the string
   */
  APU_DECLARE(apr_status_t) apr_md5_encode(const char *password, const char *salt,
                                           char *result, apr_size_t nbytes);
  
  
  /**
   * Validate any password encypted with any algorithm that APR understands
   * @param passwd The password to validate
   * @param hash The password to validate against
   */
  APU_DECLARE(apr_status_t) apr_password_validate(const char *passwd, 
                                                  const char *hash);
  
  
  /** @} */
  #ifdef __cplusplus
  }
  #endif
  
  #endif /* !APR_MD5_H */
  
  
  

Mime
View raw message