let remote_name override name supplied by peer; some minor fixes
authorPaul Mackerras <paulus@samba.org>
Wed, 30 Apr 1997 05:51:08 +0000 (05:51 +0000)
committerPaul Mackerras <paulus@samba.org>
Wed, 30 Apr 1997 05:51:08 +0000 (05:51 +0000)
pppd/chap.c

index 2fcd3a5ae8301e7963886a4317e63d0641b1a547..b418f6f493f002a192b0d8699a3530dcd5becc02 100644 (file)
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap.c,v 1.13 1996/07/01 01:12:09 paulus Exp $";
+static char rcsid[] = "$Id: chap.c,v 1.14 1997/04/30 05:51:08 paulus Exp $";
 #endif
 
 /*
@@ -85,9 +85,10 @@ struct protent chap_protent = {
 
 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));
@@ -181,7 +182,7 @@ ChapAuthPeer(unit, our_name, digest)
  */
 static void
 ChapChallengeTimeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     chap_state *cstate = (chap_state *) arg;
   
@@ -208,7 +209,7 @@ ChapChallengeTimeout(arg)
  */
 static void
 ChapResponseTimeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     chap_state *cstate = (chap_state *) arg;
 
@@ -225,7 +226,7 @@ ChapResponseTimeout(arg)
  */
 static void
 ChapRechallenge(arg)
-    caddr_t arg;
+    void *arg;
 {
     chap_state *cstate = (chap_state *) arg;
 
@@ -279,12 +280,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;
@@ -389,6 +390,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 ||
@@ -421,8 +423,9 @@ 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)) {
+       strncpy(rhostname, remote_name, sizeof(rhostname));
+       rhostname[sizeof(rhostname) - 1] = 0;
        CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: using '%s' as remote name",
                   rhostname));
     }
@@ -437,7 +440,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;
@@ -450,8 +453,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;
 
@@ -487,6 +490,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));
 
@@ -528,7 +532,7 @@ ChapReceiveResponse(cstate, inp, id, len)
        return;
     }
 
-    UNTIMEOUT(ChapChallengeTimeout, (caddr_t) cstate);
+    UNTIMEOUT(ChapChallengeTimeout, cstate);
 
     if (len >= sizeof(rhostname))
        len = sizeof(rhostname) - 1;
@@ -559,10 +563,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;
 
@@ -581,7 +585,7 @@ ChapReceiveResponse(cstate, inp, id, len)
            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);
 
     } else {
        syslog(LOG_ERR, "CHAP peer authentication failed");
@@ -614,7 +618,7 @@ ChapReceiveSuccess(cstate, inp, id, len)
        return;
     }
 
-    UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+    UNTIMEOUT(ChapResponseTimeout, cstate);
 
     /*
      * Print message.
@@ -647,7 +651,7 @@ ChapReceiveFailure(cstate, inp, id, len)
        return;
     }
 
-    UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+    UNTIMEOUT(ChapResponseTimeout, cstate);
 
     /*
      * Print message.
@@ -692,7 +696,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;
 }
 
@@ -792,7 +796,7 @@ 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;
 }