httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/lib apr_md5.c
Date Sun, 23 Apr 2000 01:33:41 GMT
fielding    00/04/22 18:33:40

  Modified:    src/lib/apr/include apr_md5.h
               src/lib/apr/lib apr_md5.c
  Log:
  Replace APR_MD5_CTX with ap_MD5_ctx_t, as suggested by Bill Rowe.
  
  Revision  Changes    Path
  1.8       +8 -6      apache-2.0/src/lib/apr/include/apr_md5.h
  
  Index: apr_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_md5.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_md5.h	2000/03/31 08:35:56	1.7
  +++ apr_md5.h	2000/04/23 01:33:40	1.8
  @@ -101,14 +101,16 @@
       UINT4 state[4];		/* state (ABCD) */
       UINT4 count[2];		/* number of bits, modulo 2^64 (lsb first) */
       unsigned char buffer[64];	/* input buffer */
  -} APR_MD5_CTX;
  +} ap_MD5_ctx_t;
   
  -API_EXPORT(ap_status_t) ap_MD5Init(APR_MD5_CTX * context);
  -API_EXPORT(ap_status_t) ap_MD5Update(APR_MD5_CTX * context, const unsigned char *input,
  -			   unsigned int inputLen);
  -API_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[16], APR_MD5_CTX * context);
  +API_EXPORT(ap_status_t) ap_MD5Init(ap_MD5_ctx_t * context);
  +API_EXPORT(ap_status_t) ap_MD5Update(ap_MD5_ctx_t *context,
  +                                     const unsigned char *input,
  +                                     unsigned int inputLen);
  +API_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[16],
  +                                    ap_MD5_ctx_t *context);
   API_EXPORT(ap_status_t) ap_MD5Encode(const char *password, const char *salt,
  -			      char *result, size_t nbytes);
  +                                     char *result, size_t nbytes);
   
   #ifdef __cplusplus
   }
  
  
  
  1.11      +4 -4      apache-2.0/src/lib/apr/lib/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_md5.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_md5.c	2000/04/22 06:16:26	1.10
  +++ apr_md5.c	2000/04/23 01:33:40	1.11
  @@ -181,7 +181,7 @@
   
   /* MD5 initialization. Begins an MD5 operation, writing a new context.
    */
  -API_EXPORT(ap_status_t) ap_MD5Init(APR_MD5_CTX * context)
  +API_EXPORT(ap_status_t) ap_MD5Init(ap_MD5_ctx_t * context)
   {
       context->count[0] = context->count[1] = 0;
       /* Load magic initialization constants. */
  @@ -196,7 +196,7 @@
      operation, processing another message block, and updating the
      context.
    */
  -API_EXPORT(ap_status_t) ap_MD5Update(APR_MD5_CTX * context, const unsigned char *input,
  +API_EXPORT(ap_status_t) ap_MD5Update(ap_MD5_ctx_t * context, const unsigned char *input,
   			   unsigned int inputLen)
   {
       unsigned int i, idx, partLen;
  @@ -252,7 +252,7 @@
   /* MD5 finalization. Ends an MD5 message-digest operation, writing the
      the message digest and zeroizing the context.
    */
  -API_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[16], APR_MD5_CTX * context)
  +API_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[16], ap_MD5_ctx_t * context)
   {
       unsigned char bits[8];
       unsigned int idx, padLen;
  @@ -446,7 +446,7 @@
       const char *sp, *ep;
       unsigned char final[16];
       int sl, pl, i;
  -    APR_MD5_CTX ctx, ctx1;
  +    ap_MD5_ctx_t ctx, ctx1;
       unsigned long l;
   
       /* 
  
  
  

Mime
View raw message