Changing USE_SRP to PPP_WITH_SRP for consistency

[ppp.git] / pppd / ccp.c

diff --git a/pppd/ccp.c b/pppd/ccp.c
index 052c4c61081bdc74489ea282e8e0df46ed1891fc..cfe94f8e9f3af44813a6e2cda02b2243924df956 100644 (file)
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -28,6 +28,10 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define RCSID  "$Id: ccp.c,v 1.50 2005/06/26 19:34:41 carlsonj Exp $"
 
 #include <stdlib.h>
@@ -38,10 +42,9 @@
 #include "ccp.h"
 #include <net/ppp-comp.h>
 
-#ifdef MPPE
-#include "chap_ms.h"   /* mppe_xxxx_key, mppe_keys_set */
+#include "chap_ms.h"
+#include "mppe.h"
 #include "lcp.h"       /* lcp_close(), lcp_fsm */
-#endif
 
 
 /*
@@ -64,7 +67,7 @@ static char deflate_value[8];
 /*
  * Option variables.
  */
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
 bool refuse_mppe_stateful = 1;         /* Allow stateful mode? */
 #endif
 
@@ -107,7 +110,7 @@ static option_t ccp_option_list[] = {
       "don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
       &ccp_allowoptions[0].predictor_1 },
 
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     /* MPPE options are symmetrical ... we only set wantoptions here */
     { "require-mppe", o_bool, &ccp_wantoptions[0].mppe,
       "require MPPE encryption",
@@ -442,7 +445,7 @@ ccp_input(int unit, u_char *p, int len)
     fsm_input(f, p, len);
     if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) {
        notice("Compression disabled by peer.");
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
        if (ccp_gotoptions[unit].mppe) {
            error("MPPE disabled, closing LCP");
            lcp_close(unit, "MPPE disabled by peer");
@@ -497,7 +500,7 @@ ccp_protrej(int unit)
     ccp_flags_set(unit, 0, 0);
     fsm_lowerdown(&ccp_fsm[unit]);
 
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (ccp_gotoptions[unit].mppe) {
        error("MPPE required but peer negotiation failed");
        lcp_close(unit, "MPPE required but peer negotiation failed");
@@ -518,11 +521,11 @@ ccp_resetci(fsm *f)
     *go = ccp_wantoptions[f->unit];
     all_rejected[f->unit] = 0;
 
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (go->mppe) {
        ccp_options *ao = &ccp_allowoptions[f->unit];
        int auth_mschap_bits = auth_done[f->unit];
-#ifdef USE_EAPTLS
+#ifdef PPP_WITH_EAPTLS
        int auth_eap_bits = auth_done[f->unit];
 #endif
        int numbits;
@@ -553,7 +556,7 @@ ccp_resetci(fsm *f)
            return;
        }
 
-#ifdef USE_EAPTLS
+#ifdef PPP_WITH_EAPTLS
     /*
      * MPPE is also possible in combination with EAP-TLS.
      * It is not possible to detect if we're doing EAP or EAP-TLS
@@ -574,7 +577,7 @@ ccp_resetci(fsm *f)
        }
 
        /* A plugin (eg radius) may not have obtained key material. */
-       if (!mppe_keys_set) {
+       if (!mppe_keys_isset()) {
            error("MPPE required, but keys are not available.  "
                  "Possible plugin problem?");
            lcp_close(f->unit, "MPPE required but not available");
@@ -607,13 +610,11 @@ ccp_resetci(fsm *f)
        ao->predictor_2  = go->predictor_2  = 0;
        ao->deflate      = go->deflate      = 0;
     }
-#endif /* MPPE */
 
     /*
      * Check whether the kernel knows about the various
      * compression methods we might request.
      */
-#ifdef MPPE
     if (go->mppe) {
        opt_buf[0] = CI_MPPE;
        opt_buf[1] = CILEN_MPPE;
@@ -624,7 +625,7 @@ ccp_resetci(fsm *f)
            lcp_close(f->unit, "MPPE required but not available");
        }
     }
-#endif
+#endif /* PPP_WITH_MPPE */
     if (go->bsd_compress) {
        opt_buf[0] = CI_BSD_COMPRESS;
        opt_buf[1] = CILEN_BSD_COMPRESS;
@@ -697,7 +698,7 @@ static void
      * preference order.  Get the kernel to allocate the first one
      * in case it gets Acked.
      */
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (go->mppe) {
        u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
 
@@ -705,7 +706,7 @@ static void
        p[1] = opt_buf[1] = CILEN_MPPE;
        MPPE_OPTS_TO_CI(go->mppe, &p[2]);
        MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
-       BCOPY(mppe_recv_key, &opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN);
+       mppe_get_recv_key(&opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN);
        res = ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0);
        if (res > 0)
            p += CILEN_MPPE;
@@ -807,7 +808,7 @@ static int
     ccp_options *go = &ccp_gotoptions[f->unit];
     u_char *p0 = p;
 
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (go->mppe) {
        u_char opt_buf[CILEN_MPPE];
 
@@ -897,7 +898,7 @@ static int
     memset(&no, 0, sizeof(no));
     try = *go;
 
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (go->mppe && len >= CILEN_MPPE
        && p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
        no.mppe = 1;
@@ -919,7 +920,7 @@ static int
            lcp_close(f->unit, "MPPE required but peer negotiation failed");
        }
     }
-#endif /* MPPE */
+#endif /* PPP_WITH_MPPE */
     if (go->deflate && len >= CILEN_DEFLATE
        && p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
        && p[1] == CILEN_DEFLATE) {
@@ -988,7 +989,7 @@ ccp_rejci(fsm *f, u_char *p, int len)
     if (len == 0 && all_rejected[f->unit])
        return -1;
 
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (go->mppe && len >= CILEN_MPPE
        && p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
        error("MPPE required but peer refused");
@@ -1060,7 +1061,7 @@ ccp_reqci(fsm *f, u_char *p, int *lenp, int dont_nak)
     int len, clen, type, nb;
     ccp_options *ho = &ccp_hisoptions[f->unit];
     ccp_options *ao = &ccp_allowoptions[f->unit];
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     bool rej_for_ci_mppe = 1;  /* Are we rejecting based on a bad/missing */
                                /* CI_MPPE, or due to other options?       */
 #endif
@@ -1084,7 +1085,7 @@ ccp_reqci(fsm *f, u_char *p, int *lenp, int dont_nak)
            clen = p[1];
 
            switch (type) {
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
            case CI_MPPE:
                if (!ao->mppe || clen != CILEN_MPPE) {
                    newret = CONFREJ;
@@ -1156,8 +1157,7 @@ ccp_reqci(fsm *f, u_char *p, int *lenp, int dont_nak)
                    int mtu;
 
                    BCOPY(p, opt_buf, CILEN_MPPE);
-                   BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-                         MPPE_MAX_KEY_LEN);
+                   mppe_get_send_key(&opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN);
                    if (ccp_test(f->unit, opt_buf,
                                 CILEN_MPPE + MPPE_MAX_KEY_LEN, 1) <= 0) {
                        /* This shouldn't happen, we've already tested it! */
@@ -1185,7 +1185,7 @@ ccp_reqci(fsm *f, u_char *p, int *lenp, int dont_nak)
                 */
                rej_for_ci_mppe = 0;
                break;
-#endif /* MPPE */
+#endif /* PPP_WITH_MPPE */
            case CI_DEFLATE:
            case CI_DEFLATE_DRAFT:
                if (!ao->deflate || clen != CILEN_DEFLATE
@@ -1327,7 +1327,7 @@ ccp_reqci(fsm *f, u_char *p, int *lenp, int dont_nak)
        else
            *lenp = retp - p0;
     }
-#ifdef MPPE
+#ifdef PPP_WITH_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");
@@ -1347,7 +1347,7 @@ method_name(ccp_options *opt, ccp_options *opt2)
     if (!ANY_COMPRESS(*opt))
        return "(none)";
     switch (opt->method) {
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     case CI_MPPE:
     {
        char *p = result;
@@ -1424,10 +1424,9 @@ ccp_up(fsm *f)
            notice("%s receive compression enabled", method_name(go, NULL));
     } else if (ANY_COMPRESS(*ho))
        notice("%s transmit compression enabled", method_name(ho, NULL));
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (go->mppe) {
-       BZERO(mppe_recv_key, MPPE_MAX_KEY_LEN);
-       BZERO(mppe_send_key, MPPE_MAX_KEY_LEN);
+       mppe_clear_keys();
        continue_networks(f->unit);             /* Bring up IP et al */
     }
 #endif
@@ -1443,7 +1442,7 @@ ccp_down(fsm *f)
        UNTIMEOUT(ccp_rack_timeout, f);
     ccp_localstate[f->unit] = 0;
     ccp_flags_set(f->unit, 1, 0);
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
     if (ccp_gotoptions[f->unit].mppe) {
        ccp_gotoptions[f->unit].mppe = 0;
        if (lcp_fsm[f->unit].state == OPENED) {
@@ -1506,7 +1505,7 @@ ccp_printpkt(u_char *p, int plen,
            len -= optlen;
            optend = p + optlen;
            switch (code) {
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
            case CI_MPPE:
                if (optlen >= CILEN_MPPE) {
                    u_char mppe_opts;
@@ -1608,7 +1607,7 @@ ccp_datainput(int unit, u_char *pkt, int len)
             */
            error("Lost compression sync: disabling compression");
            ccp_close(unit, "Lost compression sync");
-#ifdef MPPE
+#ifdef PPP_WITH_MPPE
            /*
             * If we were doing MPPE, we must also take the link down.
             */