X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fccp.c;h=440ddc8f3cb8d14141daf6fbe5bdab14523130fe;hb=39c06d616dd4c9443ed390969e58cd53ca1e314d;hp=18f2dc0cdbd871e6f6b613b7a7e3f185c943cc20;hpb=f53a48eb9d74db3c71938e114b7f489c339bc003;p=ppp.git

diff --git a/pppd/ccp.c b/pppd/ccp.c
index 18f2dc0..440ddc8 100644
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -33,7 +33,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: ccp.c,v 1.41 2002/12/04 23:03:32 paulus Exp $"
+#define RCSID	"$Id: ccp.c,v 1.44 2003/03/05 23:01:28 fcusack Exp $"
 
 #include <stdlib.h>
 #include <string.h>
@@ -44,7 +44,7 @@
 #include <net/ppp-comp.h>
 
 #ifdef MPPE
-#include "chap_ms.h"	/* mppe_xxxx_key */
+#include "chap_ms.h"	/* mppe_xxxx_key, mppe_keys_set */
 #include "lcp.h"	/* lcp_close(), lcp_fsm */
 #endif
 
@@ -578,6 +578,14 @@ ccp_resetci(f)
 	    return;
 	}
 
+	/* A plugin (eg radius) may not have obtained key material. */
+	if (!mppe_keys_set) {
+	    error("MPPE required, but keys are not available.  "
+		  "Possible plugin problem?");
+	    lcp_close(f->unit, "MPPE required but not available");
+	    return;
+	}
+
 	/* LM auth not supported for MPPE */
 	if (auth_done[f->unit] & (CHAP_MS_WITHPEER | CHAP_MS_PEER)) {
 	    /* This might be noise */
@@ -910,7 +918,7 @@ ccp_nakci(f, p, len)
 	MPPE_CI_TO_OPTS(&p[2], try.mppe);
 	if ((try.mppe & MPPE_OPT_STATEFUL) && refuse_mppe_stateful)
 	    try.mppe = 0;
-	else if ((go->mppe & try.mppe) != try.mppe)
+	else if (((go->mppe | MPPE_OPT_STATEFUL) & try.mppe) != try.mppe)
 	    /* Peer must have set options we didn't request (suggest) */
 	    try.mppe = 0;
 
@@ -1073,7 +1081,8 @@ ccp_reqci(f, p, lenp, dont_nak)
     ccp_options *ho = &ccp_hisoptions[f->unit];
     ccp_options *ao = &ccp_allowoptions[f->unit];
 #ifdef MPPE
-    bool seen_ci_mppe = 0;
+    bool rej_for_ci_mppe = 1;	/* Are we rejecting based on a bad/missing */
+				/* CI_MPPE, or due to other options?       */
 #endif
 
     ret = CONFACK;
@@ -1101,7 +1110,6 @@ ccp_reqci(f, p, lenp, dont_nak)
 		    newret = CONFREJ;
 		    break;
 		}
-		seen_ci_mppe = 1;
 		MPPE_CI_TO_OPTS(&p[2], ho->mppe);
 
 		/* Nak if anything unsupported or unknown are set. */
@@ -1116,17 +1124,15 @@ ccp_reqci(f, p, lenp, dont_nak)
 
 		/* Check state opt */
 		if (ho->mppe & MPPE_OPT_STATEFUL) {
+		    /*
+		     * We can Nak and request stateless, but it's a
+		     * lot easier to just assume the peer will request
+		     * it if he can do it; stateful mode is bad over
+		     * the Internet -- which is where we expect MPPE.
+		     */
 		   if (refuse_mppe_stateful) {
-			/*
-			 * We can Nak and request stateless, but it's a
-			 * lot easier to just assume the peer will request
-			 * it if he can do it; stateful mode is bad over
-			 * the Internet -- which is where we expect MPPE.
-			 */
 			newret = CONFREJ;
 			break;
-		    } else {
-			newret = CONFNAK;
 		    }
 		}
 
@@ -1188,6 +1194,12 @@ ccp_reqci(f, p, lenp, dont_nak)
 			newret = CONFREJ;
 		}
 
+		/*
+		 * We have accepted MPPE or are willing to negotiate
+		 * MPPE parameters.  A CONFREJ is due to subsequent
+		 * (non-MPPE) processing.
+		 */
+		rej_for_ci_mppe = 0;
 		break;
 #endif /* MPPE */
 	    case CI_DEFLATE:
@@ -1332,7 +1344,7 @@ ccp_reqci(f, p, lenp, dont_nak)
 	    *lenp = retp - p0;
     }
 #ifdef MPPE
-    if (ret == CONFREJ && ao->mppe && !seen_ci_mppe) {
+    if (ret == CONFREJ && ao->mppe && rej_for_ci_mppe) {
 	error("MPPE required but peer negotiation failed");
 	lcp_close(f->unit, "MPPE required but peer negotiation failed");
     }