X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Fradius%2Fsendserver.c;h=acf78e5fa0000a41e4eb547509cc110030861b05;hb=3ae4027842d48c3c92996ffb8443b9b320c1c775;hp=0c0ef30f8d37f41309cc395a9d3fad5153130f08;hpb=2ae35d6c067d198c5e0bb4ac2d480271f3de3540;p=ppp.git

diff --git a/pppd/plugins/radius/sendserver.c b/pppd/plugins/radius/sendserver.c
index 0c0ef30..acf78e5 100644
--- a/pppd/plugins/radius/sendserver.c
+++ b/pppd/plugins/radius/sendserver.c
@@ -104,7 +104,7 @@ static int rc_pack_list (VALUE_PAIR *vp, char *secret, AUTH_HDR *auth)
 		    memcpy ((char *) passbuf, vp->strvalue, (size_t) length);
 
 		    secretlen = strlen (secret);
-		    vector = (char *)auth->vector;
+		    vector = auth->vector;
 		    for(i = 0; i < padded_length; i += AUTH_VECTOR_LEN) {
 			/* Calculate the MD5 digest*/
 			strcpy ((char *) md5buf, secret);
@@ -200,10 +200,10 @@ int rc_send_server (SEND_DATA *data, char *msg, REQUEST_INFO *info)
 	AUTH_HDR       *auth, *recv_auth;
 	UINT4           auth_ipaddr;
 	char           *server_name;	/* Name of server to query */
-	int             salen;
+	socklen_t       salen;
 	int             result;
 	int             total_length;
-	int             length;
+	socklen_t       length;
 	int             retry_max;
 	int		secretlen;
 	char            secret[MAX_SECRET_LENGTH + 1];
@@ -228,6 +228,7 @@ int rc_send_server (SEND_DATA *data, char *msg, REQUEST_INFO *info)
 	{
 		if (rc_find_server (server_name, &auth_ipaddr, secret) != 0)
 		{
+			memset (secret, '\0', sizeof (secret));
 			return (ERROR_RC);
 		}
 	}
@@ -272,7 +273,7 @@ int rc_send_server (SEND_DATA *data, char *msg, REQUEST_INFO *info)
 		memset((char *) auth->vector, 0, AUTH_VECTOR_LEN);
 		secretlen = strlen (secret);
 		memcpy ((char *) auth + total_length, secret, secretlen);
-		rc_md5_calc (vector, (char *) auth, total_length + secretlen);
+		rc_md5_calc (vector, (unsigned char *) auth, total_length + secretlen);
 		memcpy ((char *) auth->vector, (char *) vector, AUTH_VECTOR_LEN);
 	}
 	else
@@ -362,7 +363,7 @@ int rc_send_server (SEND_DATA *data, char *msg, REQUEST_INFO *info)
 	{
 		if ((vp = rc_avpair_get(vp, PW_REPLY_MESSAGE)))
 		{
-			strcat(msg, vp->strvalue);
+			strcat(msg, (char*) vp->strvalue);
 			strcat(msg, "\n");
 			vp = vp->next;
 		}
@@ -428,7 +429,7 @@ static int rc_check_reply (AUTH_HDR *auth, int bufferlen, char *secret,
 	memcpy ((char *) reply_digest, (char *) auth->vector, AUTH_VECTOR_LEN);
 	memcpy ((char *) auth->vector, (char *) vector, AUTH_VECTOR_LEN);
 	memcpy ((char *) auth + totallen, secret, secretlen);
-	rc_md5_calc (calc_digest, (char *) auth, totallen + secretlen);
+	rc_md5_calc (calc_digest, (unsigned char *) auth, totallen + secretlen);
 
 #ifdef DIGEST_DEBUG
 	{
@@ -490,7 +491,7 @@ static void rc_random_vector (unsigned char *vector)
    we use /dev/urandom here, as /dev/random might block and we don't
    need that much randomness. BTW, great idea, Ted!     -lf, 03/18/95	*/
 
-	if ((fd = open(_PATH_DEV_URANDOM, O_RDONLY)) >= 0)
+	if ((fd = open(PPP_PATH_DEV_URANDOM, O_RDONLY)) >= 0)
 	{
 		unsigned char *pos;
 		int readcount;