use strlcpy, strlcat, slprintf everywhere

[ppp.git] / pppd / chap.c

diff --git a/pppd/chap.c b/pppd/chap.c
index 1dad8f649b3d4b91c491352cdf4231399aa52950..6b405f195d409d62734294544ed9707256c1080a 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap.c,v 1.12 1996/05/28 00:42:27 paulus Exp $";
+static char rcsid[] = "$Id: chap.c,v 1.18 1999/03/12 06:07:15 paulus Exp $";
 #endif
 
 /*
@@ -54,17 +54,59 @@ static char rcsid[] = "$Id: chap.c,v 1.12 1996/05/28 00:42:27 paulus Exp $";
 #include "chap_ms.h"
 #endif
 
+/*
+ * Command-line options.
+ */
+static option_t chap_option_list[] = {
+    { "chap-restart", o_int, &chap[0].timeouttime,
+      "Set timeout for CHAP" },
+    { "chap-max-challenge", o_int, &chap[0].max_transmits,
+      "Set max #xmits for challenge" },
+    { "chap-interval", o_int, &chap[0].chal_interval,
+      "Set interval for rechallenge" },
+#ifdef MSLANMAN
+    { "ms-lanman", o_bool, &ms_lanman,
+      "Use LanMan passwd when using MS-CHAP", 1 },
+#endif
+    { NULL }
+};
+
+/*
+ * Protocol entry points.
+ */
+static void ChapInit __P((int));
+static void ChapLowerUp __P((int));
+static void ChapLowerDown __P((int));
+static void ChapInput __P((int, u_char *, int));
+static void ChapProtocolReject __P((int));
+static int  ChapPrintPkt __P((u_char *, int,
+                             void (*) __P((void *, char *, ...)), void *));
+
 struct protent chap_protent = {
-    PPP_CHAP, ChapInit, ChapInput, ChapProtocolReject,
-    ChapLowerUp, ChapLowerDown, NULL, NULL,
-    ChapPrintPkt, NULL, 1, "CHAP", NULL, NULL
+    PPP_CHAP,
+    ChapInit,
+    ChapInput,
+    ChapProtocolReject,
+    ChapLowerUp,
+    ChapLowerDown,
+    NULL,
+    NULL,
+    ChapPrintPkt,
+    NULL,
+    1,
+    "CHAP",
+    chap_option_list,
+    NULL,
+    NULL,
+    NULL
 };
 
 chap_state chap[NUM_PPP];              /* CHAP state; one for each unit */
 
-static void ChapChallengeTimeout __P((caddr_t));
-static void ChapResponseTimeout __P((caddr_t));
+static void ChapChallengeTimeout __P((void *));
+static void ChapResponseTimeout __P((void *));
 static void ChapReceiveChallenge __P((chap_state *, u_char *, int, int));
+static void ChapRechallenge __P((void *));
 static void ChapReceiveResponse __P((chap_state *, u_char *, int, int));
 static void ChapReceiveSuccess __P((chap_state *, u_char *, int, int));
 static void ChapReceiveFailure __P((chap_state *, u_char *, int, int));
@@ -79,7 +121,7 @@ extern void srand48 __P((long));
 /*
  * ChapInit - Initialize a CHAP unit.
  */
-void
+static void
 ChapInit(unit)
     int unit;
 {
@@ -158,7 +200,7 @@ ChapAuthPeer(unit, our_name, digest)
  */
 static void
 ChapChallengeTimeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     chap_state *cstate = (chap_state *) arg;
   
@@ -185,7 +227,7 @@ ChapChallengeTimeout(arg)
  */
 static void
 ChapResponseTimeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     chap_state *cstate = (chap_state *) arg;
 
@@ -202,7 +244,7 @@ ChapResponseTimeout(arg)
  */
 static void
 ChapRechallenge(arg)
-    caddr_t arg;
+    void *arg;
 {
     chap_state *cstate = (chap_state *) arg;
 
@@ -221,7 +263,7 @@ ChapRechallenge(arg)
  *
  * Start up if we have pending requests.
  */
-void
+static void
 ChapLowerUp(unit)
     int unit;
 {
@@ -247,7 +289,7 @@ ChapLowerUp(unit)
  *
  * Cancel all timeouts.
  */
-void
+static void
 ChapLowerDown(unit)
     int unit;
 {
@@ -256,12 +298,12 @@ ChapLowerDown(unit)
     /* Timeout(s) pending?  Cancel if so. */
     if (cstate->serverstate == CHAPSS_INITIAL_CHAL ||
        cstate->serverstate == CHAPSS_RECHALLENGE)
-       UNTIMEOUT(ChapChallengeTimeout, (caddr_t) cstate);
+       UNTIMEOUT(ChapChallengeTimeout, cstate);
     else if (cstate->serverstate == CHAPSS_OPEN
             && cstate->chal_interval != 0)
-       UNTIMEOUT(ChapRechallenge, (caddr_t) cstate);
+       UNTIMEOUT(ChapRechallenge, cstate);
     if (cstate->clientstate == CHAPCS_RESPONSE)
-       UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+       UNTIMEOUT(ChapResponseTimeout, cstate);
 
     cstate->clientstate = CHAPCS_INITIAL;
     cstate->serverstate = CHAPSS_INITIAL;
@@ -271,7 +313,7 @@ ChapLowerDown(unit)
 /*
  * ChapProtocolReject - Peer doesn't grok CHAP.
  */
-void
+static void
 ChapProtocolReject(unit)
     int unit;
 {
@@ -290,7 +332,7 @@ ChapProtocolReject(unit)
 /*
  * ChapInput - Input CHAP packet.
  */
-void
+static void
 ChapInput(unit, inpacket, packet_len)
     int unit;
     u_char *inpacket;
@@ -366,6 +408,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
     char secret[MAXSECRETLEN];
     char rhostname[256];
     MD5_CTX mdContext;
+    u_char hash[MD5_SIGNATURE_SIZE];
  
     CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: Rcvd id %d.", id));
     if (cstate->clientstate == CHAPCS_CLOSED ||
@@ -398,8 +441,8 @@ ChapReceiveChallenge(cstate, inp, id, len)
               rhostname));
 
     /* Microsoft doesn't send their name back in the PPP packet */
-    if (rhostname[0] == 0 && cstate->resp_type == CHAP_MICROSOFT) {
-       strcpy(rhostname, remote_name);
+    if (remote_name[0] != 0 && (explicit_remote || rhostname[0] == 0)) {
+       strlcpy(rhostname, sizeof(rhostname), remote_name);
        CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: using '%s' as remote name",
                   rhostname));
     }
@@ -414,7 +457,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
 
     /* cancel response send timeout if necessary */
     if (cstate->clientstate == CHAPCS_RESPONSE)
-       UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+       UNTIMEOUT(ChapResponseTimeout, cstate);
 
     cstate->resp_id = id;
     cstate->resp_transmits = 0;
@@ -427,8 +470,8 @@ ChapReceiveChallenge(cstate, inp, id, len)
        MD5Update(&mdContext, &cstate->resp_id, 1);
        MD5Update(&mdContext, secret, secret_len);
        MD5Update(&mdContext, rchallenge, rchallenge_len);
-       MD5Final(&mdContext);
-       BCOPY(mdContext.digest, cstate->response, MD5_SIGNATURE_SIZE);
+       MD5Final(hash, &mdContext);
+       BCOPY(hash, cstate->response, MD5_SIGNATURE_SIZE);
        cstate->resp_length = MD5_SIGNATURE_SIZE;
        break;
 
@@ -443,6 +486,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
        return;
     }
 
+    BZERO(secret, sizeof(secret));
     ChapSendResponse(cstate);
 }
 
@@ -463,6 +507,7 @@ ChapReceiveResponse(cstate, inp, id, len)
     char rhostname[256];
     MD5_CTX mdContext;
     char secret[MAXSECRETLEN];
+    u_char hash[MD5_SIGNATURE_SIZE];
 
     CHAPDEBUG((LOG_INFO, "ChapReceiveResponse: Rcvd id %d.", id));
 
@@ -504,7 +549,7 @@ ChapReceiveResponse(cstate, inp, id, len)
        return;
     }
 
-    UNTIMEOUT(ChapChallengeTimeout, (caddr_t) cstate);
+    UNTIMEOUT(ChapChallengeTimeout, cstate);
 
     if (len >= sizeof(rhostname))
        len = sizeof(rhostname) - 1;
@@ -535,10 +580,10 @@ ChapReceiveResponse(cstate, inp, id, len)
            MD5Update(&mdContext, &cstate->chal_id, 1);
            MD5Update(&mdContext, secret, secret_len);
            MD5Update(&mdContext, cstate->challenge, cstate->chal_len);
-           MD5Final(&mdContext); 
+           MD5Final(hash, &mdContext); 
 
            /* compare local and remote MDs and send the appropriate status */
-           if (memcmp (mdContext.digest, remmd, MD5_SIGNATURE_SIZE) == 0)
+           if (memcmp (hash, remmd, MD5_SIGNATURE_SIZE) == 0)
                code = CHAP_SUCCESS;    /* they are the same! */
            break;
 
@@ -547,19 +592,23 @@ ChapReceiveResponse(cstate, inp, id, len)
        }
     }
 
+    BZERO(secret, sizeof(secret));
     ChapSendStatus(cstate, code);
 
     if (code == CHAP_SUCCESS) {
        old_state = cstate->serverstate;
        cstate->serverstate = CHAPSS_OPEN;
        if (old_state == CHAPSS_INITIAL_CHAL) {
-           auth_peer_success(cstate->unit, PPP_CHAP);
+           auth_peer_success(cstate->unit, PPP_CHAP, rhostname, len);
        }
        if (cstate->chal_interval != 0)
-           TIMEOUT(ChapRechallenge, (caddr_t) cstate, cstate->chal_interval);
+           TIMEOUT(ChapRechallenge, cstate, cstate->chal_interval);
+       syslog(LOG_NOTICE, "CHAP peer authentication succeeded for %s",
+              rhostname);
 
     } else {
-       syslog(LOG_ERR, "CHAP peer authentication failed");
+       syslog(LOG_ERR, "CHAP peer authentication failed for remote host %s",
+              rhostname);
        cstate->serverstate = CHAPSS_BADAUTH;
        auth_peer_fail(cstate->unit, PPP_CHAP);
     }
@@ -589,7 +638,7 @@ ChapReceiveSuccess(cstate, inp, id, len)
        return;
     }
 
-    UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+    UNTIMEOUT(ChapResponseTimeout, cstate);
 
     /*
      * Print message.
@@ -622,7 +671,7 @@ ChapReceiveFailure(cstate, inp, id, len)
        return;
     }
 
-    UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+    UNTIMEOUT(ChapResponseTimeout, cstate);
 
     /*
      * Print message.
@@ -667,7 +716,7 @@ ChapSendChallenge(cstate)
   
     CHAPDEBUG((LOG_INFO, "ChapSendChallenge: Sent id %d.", cstate->chal_id));
 
-    TIMEOUT(ChapChallengeTimeout, (caddr_t) cstate, cstate->timeouttime);
+    TIMEOUT(ChapChallengeTimeout, cstate, cstate->timeouttime);
     ++cstate->chal_transmits;
 }
 
@@ -767,18 +816,18 @@ ChapSendResponse(cstate)
     output(cstate->unit, outpacket_buf, outlen + PPP_HDRLEN);
 
     cstate->clientstate = CHAPCS_RESPONSE;
-    TIMEOUT(ChapResponseTimeout, (caddr_t) cstate, cstate->timeouttime);
+    TIMEOUT(ChapResponseTimeout, cstate, cstate->timeouttime);
     ++cstate->resp_transmits;
 }
 
 /*
  * ChapPrintPkt - print the contents of a CHAP packet.
  */
-char *ChapCodenames[] = {
+static char *ChapCodenames[] = {
     "Challenge", "Response", "Success", "Failure"
 };
 
-int
+static int
 ChapPrintPkt(p, plen, printer, arg)
     u_char *p;
     int plen;