mmanders 01/06/14 12:44:01
Modified: jk/native/common jk_ajp14.c jk_md5.c
Log:
Added additional casts so that it will build properly for NetWare.
Revision Changes Path
1.7 +6 -6 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c
Index: jk_ajp14.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_ajp14.c 2001/06/13 21:30:28 1.6
+++ jk_ajp14.c 2001/06/14 19:43:57 1.7
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: Next generation bi-directional protocol handler. *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***************************************************************************/
@@ -65,7 +65,7 @@
#include "jk_map.h"
#include "jk_ajp_common.h"
#include "jk_ajp14.h"
-#include "jk_md5.h"
+#include "jk_md5.h"
/*
* Compute the MD5 with ENTROPY / SECRET KEY
@@ -73,7 +73,7 @@
void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l)
{
- jk_md5(s->entropy, s->secret_key, s->computed_key);
+ jk_md5((const unsigned char *)s->entropy, (const unsigned char
*)s->secret_key, s->computed_key);
jk_log(l, JK_LOG_DEBUG, "Into ajp14_compute_md5 (%s)\n", s->computed_key);
}
@@ -134,7 +134,7 @@
jk_login_service_t *s,
jk_logger_t *l)
{
- if (jk_b_get_bytes(msg, s->entropy, AJP14_ENTROPY_SEED_LEN) < 0) {
+ if (jk_b_get_bytes(msg, (unsigned char *)s->entropy, AJP14_ENTROPY_SEED_LEN) <
0) {
jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_login_seed - can't get
seed\n");
return JK_FALSE;
}
@@ -172,7 +172,7 @@
/*
* COMPUTED-SEED
*/
- if (jk_b_append_bytes(msg, s->computed_key, AJP14_COMPUTED_KEY_LEN)) {
+ if (jk_b_append_bytes(msg, (const unsigned char *)s->computed_key,
AJP14_COMPUTED_KEY_LEN)) {
jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_login_comp_into_msgb - Error
appending the COMPUTED MD5 bytes\n");
return JK_FALSE;
}
@@ -280,7 +280,7 @@
/*
* COMPUTED-SEED
*/
- if (jk_b_append_bytes(msg, s->computed_key, AJP14_COMPUTED_KEY_LEN)) {
+ if (jk_b_append_bytes(msg, (const unsigned char *)s->computed_key,
AJP14_COMPUTED_KEY_LEN)) {
jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_shutdown_into_msgb - Error
appending the COMPUTED MD5 bytes\n");
return JK_FALSE;
}
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_md5.c 2001/06/13 21:30:21 1.3
+++ jk_md5.c 2001/06/14 19:43:58 1.4
@@ -103,7 +103,7 @@
/***************************************************************************
* Description: MD5 encoding wrapper *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
/*
@@ -463,13 +463,13 @@
char buf[JK_MD5_DIGESTSIZE + 1];
jk_MD5Init(&ctx);
- jk_MD5Update(&ctx, org, strlen(org));
+ jk_MD5Update(&ctx, org, strlen((const char *)org));
if (org2 != NULL)
- jk_MD5Update(&ctx, org2, strlen(org2));
+ jk_MD5Update(&ctx, org2, strlen((const char *)org2));
- jk_MD5Final(buf, &ctx);
- return (jk_hextocstr(buf, dst, JK_MD5_DIGESTSIZE));
+ jk_MD5Final((unsigned char *)buf, &ctx);
+ return (jk_hextocstr((unsigned char *)buf, dst, JK_MD5_DIGESTSIZE));
}
#else /* USE_APACHE_MD5 */
