X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Fradius%2Fradiusclient%2Fpatches%2Fmerit-2.4.21-CHAP.diff;fp=pppd%2Fplugins%2Fradius%2Fradiusclient%2Fpatches%2Fmerit-2.4.21-CHAP.diff;h=0000000000000000000000000000000000000000;hb=4abe4296f0eddbb2b6ff11dbbd27100156c85f87;hp=f6562a3cd0736c3f673cc93ac15ebe550bf625f9;hpb=4b9bf9ae2701487191810e564aaa4672eb95130e;p=ppp.git

diff --git a/pppd/plugins/radius/radiusclient/patches/merit-2.4.21-CHAP.diff b/pppd/plugins/radius/radiusclient/patches/merit-2.4.21-CHAP.diff
deleted file mode 100644
index f6562a3..0000000
--- a/pppd/plugins/radius/radiusclient/patches/merit-2.4.21-CHAP.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- funcs.c.dist	Mon May 13 00:37:37 1996
-+++ funcs.c	Mon May 13 00:58:33 1996
-@@ -830,11 +830,12 @@
- 				/* reply.*/
- 
- {
--	VALUE_PAIR     *item;
-+	VALUE_PAIR     *item, *chall;
- 	u_char          buffer[AUTH_PASS_LEN + AUTH_VECTOR_LEN + 1];
- 	int             i;
- 	int             secretlen;
- 	int             result;
-+	int		chall_len;
- 	u_char          digest[CHAP_VALUE_LENGTH];
- 	u_char         *ptr;
- 	char           *crypt ();
-@@ -896,10 +897,21 @@
- 
- 		secretlen = strlen ((char *) ptr);
- 		ptr += secretlen;
--		memcpy ((char *) ptr, (char *) authreq->vector,
--			AUTH_VECTOR_LEN);
-+
-+		/* this uses CHAP-Challenge as the challenge if it exists */
-+		/* lf, 5/13/96 */
-+		if ((chall = get_vp (authreq->request, PW_CHAP_CHALLENGE))
-+			!= (VALUE_PAIR *) NULL) {
-+			memcpy ((char *) ptr, chall->strvalue, chall->lvalue);	
-+			chall_len = chall->lvalue;
-+		} else {
-+			memcpy ((char *) ptr, (char *) authreq->vector,
-+				AUTH_VECTOR_LEN);
-+			chall_len = AUTH_VECTOR_LEN;
-+		}	
-+		
- 		md5_calc (digest, buffer,
--			  1 + CHAP_VALUE_LENGTH + secretlen);
-+			  1 + chall_len + secretlen);
- 		/* Compare them */
- 		if ((result = memcmp ((char *) digest, item->strvalue + 1,
- 				      CHAP_VALUE_LENGTH)) != 0)