tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_md5.h
Date Mon, 08 Nov 2004 13:31:55 GMT
mturk       2004/11/08 05:31:55

  Modified:    jk/native/common jk_md5.h
  Log:
  Use platform 32 bit integers
  
  Revision  Changes    Path
  1.5       +10 -14    jakarta-tomcat-connectors/jk/native/common/jk_md5.h
  
  Index: jk_md5.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_md5.h	8 Oct 2004 07:50:40 -0000	1.4
  +++ jk_md5.h	8 Nov 2004 13:31:55 -0000	1.5
  @@ -57,23 +57,19 @@
   #define JK_MD5_DIGESTSIZE 16
   
   /* JK_UINT4 defines a four byte word */
  -#if HAVE_APR
  -    typedef apr_uint32_t JK_UINT4;
  -#else
   #ifdef WIN32
       typedef DWORD JK_UINT4;
   #else
  -    typedef unsigned int JK_UINT4;
  +    typedef uint32_t JK_UINT4;
   #endif
  -#endif                          /* HAVE_APR */
   
   /* MD5 context. */
  -    typedef struct
  -    {
  -        JK_UINT4 state[4];      /* state (ABCD) */
  -        JK_UINT4 count[2];      /* number of bits, modulo 2^64 (lsb first) */
  -        unsigned char buffer[64];       /* input buffer */
  -    } JK_MD5_CTX;
  +typedef struct
  +{
  +    JK_UINT4 state[4];      /* state (ABCD) */
  +    JK_UINT4 count[2];      /* number of bits, modulo 2^64 (lsb first) */
  +    unsigned char buffer[64];       /* input buffer */
  +} JK_MD5_CTX;
   
   /*
    * Define the Magic String prefix that identifies a password as being
  @@ -82,9 +78,9 @@
   #define JK_MD5PW_ID "$apr1$"
   #define JK_MD5PW_IDLEN 6
   
  -    char *JK_METHOD jk_hextocstr(unsigned char *org, char *dst, int n);
  -    char *JK_METHOD jk_md5(const unsigned char *org,
  -                           const unsigned char *org2, char *dst);
  +char *JK_METHOD jk_hextocstr(unsigned char *org, char *dst, int n);
  +char *JK_METHOD jk_md5(const unsigned char *org,
  +                       const unsigned char *org2, char *dst);
   
   
   #ifdef __cplusplus
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message