Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 4 Jun 2001 18:11:13 -0000
Message-ID: <20010604181113.15443.qmail@apache.org>
From: jerenkrantz@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/passwd apr_md5.c

jerenkrantz    01/06/04 11:11:12

  Modified:    include  apr_md5.h
               passwd   apr_md5.c
  Log:
  - adds some trivial error checking. Maybe someone
    wants to complete this by adding the less trivial
    error checks?
  
  - adds a direct md5 computation function:
  
    apr_status_t apr_md5(unsigned char digest[MD5_DIGESTSIZE],
                         const unsigned char *input,
                         apr_size_t inputLen);
  
  This will return the md5 digest of the given input block.
  Submitted by:	Sander Striker <striker@samba-tng.org>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.25      +11 -0     apr/include/apr_md5.h
  
  Index: apr_md5.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_md5.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- apr_md5.h	2001/06/02 17:01:57	1.24
  +++ apr_md5.h	2001/06/04 18:11:02	1.25
  @@ -158,6 +158,17 @@
                                           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
  + * @deffunc apr_status_t apr_md5(unsigned char digest[MD5_DIGESTSIZE], const unsigned char *input, apr_size_t size);
  + */
  +APR_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
  
  
  
  1.13      +32 -3     apr/passwd/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apr/passwd/apr_md5.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_md5.c	2001/06/03 11:15:30	1.12
  +++ apr_md5.c	2001/06/04 18:11:09	1.13
  @@ -188,6 +188,9 @@
    */
   APR_DECLARE(apr_status_t) apr_md5_init(apr_md5_ctx_t *context)
   {
  +    if (!context)
  +        return APR_EINVAL;
  +    
       context->count[0] = context->count[1] = 0;
       
       /* Load magic initialization constants. */
  @@ -214,6 +217,9 @@
       apr_status_t rv;
       int is_sb;
   
  +    if (!context)
  +        return APR_EINVAL;
  +    
       /* TODO: remove the single-byte-only restriction from this code
        */
       rv = apr_xlate_get_sb(xlate, &is_sb);
  @@ -229,8 +235,8 @@
   #endif /* APR_HAS_XLATE */
   
   /* MD5 block update operation. Continues an MD5 message-digest
  -   operation, processing another message block, and updating the
  -   context.
  + * operation, processing another message block, and updating the
  + * context.
    */
   APR_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
                                            const unsigned char *input,
  @@ -241,6 +247,9 @@
       apr_size_t inbytes_left, outbytes_left;
   #endif
   
  +    if (!context)
  +        return APR_EINVAL;
  +    
       /* Compute number of bytes mod 64 */
       idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
   
  @@ -312,7 +321,7 @@
   }
   
   /* MD5 finalization. Ends an MD5 message-digest operation, writing the
  -   the message digest and zeroizing the context.
  + * the message digest and zeroizing the context.
    */
   APR_DECLARE(apr_status_t) apr_md5_final(unsigned char digest[MD5_DIGESTSIZE],
                                           apr_md5_ctx_t *context)
  @@ -320,6 +329,9 @@
       unsigned char bits[8];
       unsigned int idx, padLen;
   
  +    if (!context)
  +        return APR_EINVAL;
  +    
       /* Save number of bits */
       Encode(bits, context->count, 8);
   
  @@ -343,6 +355,23 @@
       memset(context, 0, sizeof(*context));
       
       return APR_SUCCESS;
  +}
  +
  +/* MD5 in one step (init, update, final)
  + */
  +APR_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. */