Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 54206 invoked from network); 8 Oct 2004 07:23:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 8 Oct 2004 07:23:27 -0000 Received: (qmail 87965 invoked by uid 500); 8 Oct 2004 07:23:05 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 87802 invoked by uid 500); 8 Oct 2004 07:23:04 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 87778 invoked by uid 500); 8 Oct 2004 07:23:03 -0000 Received: (qmail 87771 invoked by uid 99); 8 Oct 2004 07:23:03 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 08 Oct 2004 00:23:02 -0700 Received: (qmail 54043 invoked by uid 1526); 8 Oct 2004 07:22:58 -0000 Date: 8 Oct 2004 07:22:58 -0000 Message-ID: <20041008072258.54042.qmail@minotaur.apache.org> From: mturk@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_md5.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mturk 2004/10/08 00:22:58 Modified: jk/native/common jk_md5.c Log: Untabify the source code Revision Changes Path 1.10 +119 -135 jakarta-tomcat-connectors/jk/native/common/jk_md5.c Index: jk_md5.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_md5.c 24 Feb 2004 08:45:48 -0000 1.9 +++ jk_md5.c 8 Oct 2004 07:22:58 -0000 1.10 @@ -119,10 +119,10 @@ #define S44 21 static void MD5Transform(JK_UINT4 state[4], const unsigned char block[64]); -static void Encode(unsigned char *output, const JK_UINT4 *input, unsigned int len); -static void Decode(JK_UINT4 *output, const unsigned char *input, unsigned int len); +static void Encode(unsigned char *output, const JK_UINT4 *input, size_t len); +static void Decode(JK_UINT4 *output, const unsigned char *input, size_t len); static void jk_MD5Init(JK_MD5_CTX *context); -static void jk_MD5Update(JK_MD5_CTX *context, const unsigned char *input, unsigned int inputLen); +static void jk_MD5Update(JK_MD5_CTX *context, const unsigned char *input, size_t inputLen); /*static void jk_MD5Final(unsigned char digest[JK_MD5_DIGESTSIZE], JK_MD5_CTX *context);*/ static unsigned char PADDING[64] = @@ -184,17 +184,17 @@ context. */ static void jk_MD5Update(JK_MD5_CTX *context, const unsigned char *input, - unsigned int inputLen) + size_t inputLen) { - unsigned int i, idx, partLen; + size_t i, idx, partLen; /* Compute number of bytes mod 64 */ - idx = (unsigned int) ((context->count[0] >> 3) & 0x3F); + idx = (size_t) ((context->count[0] >> 3) & 0x3F); /* Update number of bits */ if ((context->count[0] += ((JK_UINT4) inputLen << 3)) - < ((JK_UINT4) inputLen << 3)) { - context->count[1]++; + < ((JK_UINT4) inputLen << 3)) { + context->count[1]++; } context->count[1] += (JK_UINT4) inputLen >> 29; @@ -203,36 +203,36 @@ /* Transform as many times as possible. */ #ifndef CHARSET_EBCDIC if (inputLen >= partLen) { - memcpy(&context->buffer[idx], input, partLen); - MD5Transform(context->state, context->buffer); + memcpy(&context->buffer[idx], input, partLen); + MD5Transform(context->state, context->buffer); - for (i = partLen; i + 63 < inputLen; i += 64) { - MD5Transform(context->state, &input[i]); - } + for (i = partLen; i + 63 < inputLen; i += 64) { + MD5Transform(context->state, &input[i]); + } - idx = 0; + idx = 0; } else { - i = 0; + i = 0; } /* Buffer remaining input */ memcpy(&context->buffer[idx], &input[i], inputLen - i); #else /*CHARSET_EBCDIC*/ if (inputLen >= partLen) { - ebcdic2ascii(&context->buffer[idx], input, partLen); - MD5Transform(context->state, context->buffer); + ebcdic2ascii(&context->buffer[idx], input, partLen); + MD5Transform(context->state, context->buffer); - for (i = partLen; i + 63 < inputLen; i += 64) { - unsigned char inp_tmp[64]; - ebcdic2ascii(inp_tmp, &input[i], 64); - MD5Transform(context->state, inp_tmp); - } + for (i = partLen; i + 63 < inputLen; i += 64) { + unsigned char inp_tmp[64]; + ebcdic2ascii(inp_tmp, &input[i], 64); + MD5Transform(context->state, inp_tmp); + } - idx = 0; + idx = 0; } else { - i = 0; + i = 0; } /* Buffer remaining input */ @@ -246,7 +246,7 @@ void JK_METHOD jk_MD5Final(unsigned char digest[16], JK_MD5_CTX *context) { unsigned char bits[8]; - unsigned int idx, padLen; + size_t idx, padLen; /* Save number of bits */ @@ -268,7 +268,7 @@ #endif /*CHARSET_EBCDIC*/ /* Pad out to 56 mod 64. */ - idx = (unsigned int) ((context->count[0] >> 3) & 0x3f); + idx = (size_t) ((context->count[0] >> 3) & 0x3f); padLen = (idx < 56) ? (56 - idx) : (120 - idx); jk_MD5Update(context, (const unsigned char *)PADDING, padLen); @@ -290,76 +290,76 @@ 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 */ + 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 */ + 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 */ + 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 */ + 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; @@ -373,61 +373,45 @@ /* Encodes input (JK_UINT4) into output (unsigned char). Assumes len is a multiple of 4. */ -static void Encode(unsigned char *output, const JK_UINT4 *input, unsigned int len) +static void Encode(unsigned char *output, const JK_UINT4 *input, size_t len) { - unsigned int i, j; + size_t i, j; JK_UINT4 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); + 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 (JK_UINT4). Assumes len is * a multiple of 4. */ -static void Decode(JK_UINT4 *output, const unsigned char *input, unsigned int len) +static void Decode(JK_UINT4 *output, const unsigned char *input, size_t len) { - unsigned int i, j; + size_t i, j; for (i = 0, j = 0; j < len; i++, j += 4) - output[i] = ((JK_UINT4) input[j]) | (((JK_UINT4) input[j + 1]) << 8) | - (((JK_UINT4) input[j + 2]) << 16) | (((JK_UINT4) input[j + 3]) << 24); -} - -/* - * 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 jk_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; - } + output[i] = ((JK_UINT4) input[j]) | (((JK_UINT4) input[j + 1]) << 8) | + (((JK_UINT4) input[j + 2]) << 16) | (((JK_UINT4) input[j + 3]) << 24); } char * JK_METHOD jk_md5(const unsigned char *org, const unsigned char *org2, char *dst) { - JK_MD5_CTX ctx; - char buf[JK_MD5_DIGESTSIZE + 1]; + JK_MD5_CTX ctx; + char buf[JK_MD5_DIGESTSIZE + 1]; jk_MD5Init(&ctx); jk_MD5Update(&ctx, org, strlen((const char *)org)); - if (org2 != NULL) - jk_MD5Update(&ctx, org2, strlen((const char *)org2)); + if (org2 != NULL) + jk_MD5Update(&ctx, org2, strlen((const char *)org2)); jk_MD5Final((unsigned char *)buf, &ctx); - return (jk_hextocstr((unsigned char *)buf, dst, JK_MD5_DIGESTSIZE)); + return (jk_hextocstr((unsigned char *)buf, dst, JK_MD5_DIGESTSIZE)); } #else /* USE_APACHE_MD5 */ @@ -438,10 +422,10 @@ #ifdef STANDARD20_MODULE_STUFF #include "apr_md5.h" -#define AP_MD5_CTX apr_md5_ctx_t -#define ap_MD5Init apr_md5_init -#define ap_MD5Update apr_md5_update -#define ap_MD5Final apr_md5_final +#define AP_MD5_CTX apr_md5_ctx_t +#define ap_MD5Init apr_md5_init +#define ap_MD5Update apr_md5_update +#define ap_MD5Final apr_md5_final #else /* STANDARD20_MODULE_STUFF */ @@ -451,17 +435,17 @@ char * JK_METHOD jk_md5(const unsigned char *org, const unsigned char *org2, char *dst) { - AP_MD5_CTX ctx; - char buf[JK_MD5_DIGESTSIZE + 1]; + AP_MD5_CTX ctx; + char buf[JK_MD5_DIGESTSIZE + 1]; ap_MD5Init(&ctx); ap_MD5Update(&ctx, org, strlen((const char *)org)); - if (org2 != NULL) - ap_MD5Update(&ctx, org2, strlen((const char *)org2)); + if (org2 != NULL) + ap_MD5Update(&ctx, org2, strlen((const char *)org2)); ap_MD5Final((unsigned char *)buf, &ctx); - return (jk_hextocstr((unsigned char *)buf, dst, JK_MD5_DIGESTSIZE)); + return (jk_hextocstr((unsigned char *)buf, dst, JK_MD5_DIGESTSIZE)); } #endif /* USE_APACHE_MD5 */ @@ -478,10 +462,10 @@ main(int argc, char ** argv) { - char xxx[(2 * JK_MD5_DIGESTSIZE) + 1]; + char xxx[(2 * JK_MD5_DIGESTSIZE) + 1]; - if (argc > 1) - printf("%s => %s\n", argv[1], jk_md5(argv[1], NULL, xxx)); + if (argc > 1) + printf("%s => %s\n", argv[1], jk_md5(argv[1], NULL, xxx)); } #endif --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org