mods to get it to compile on netbsd

diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c
index 89f95b516c84d0744f7744d8167f6669a0cf2185..c46ca13f7022eb0f4d3871284286eaa9fd2a7de5 100644 (file)
--- a/pppd/chap_ms.c
+++ b/pppd/chap_ms.c
@@ -32,15 +32,18 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap_ms.c,v 1.4 1997/05/22 06:46:19 paulus Exp $";
+static char rcsid[] = "$Id: chap_ms.c,v 1.5 1997/11/27 06:08:10 paulus Exp $";
 #endif
 
 #ifdef CHAPMS
 
 #include <stdio.h>
+#include <string.h>
+#include <ctype.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "pppd.h"
 #include "chap.h"
@@ -60,8 +63,14 @@ typedef struct {
    in case this struct gets padded. */
 
 
+static void    ChallengeResponse __P((u_char *, u_char *, u_char *));
 static void    DesEncrypt __P((u_char *, u_char *, u_char *));
 static void    MakeKey __P((u_char *, u_char *));
+static u_char  Get7Bits __P((u_char *, int));
+static void    ChapMS_NT __P((char *, int, char *, int, MS_ChapResponse *));
+#ifdef MSLANMAN
+static void    ChapMS_LANMan __P((char *, int, char *, int, MS_ChapResponse *));
+#endif
 
 #ifdef USE_CRYPT
 static void    Expand __P((u_char *, u_char *));
@@ -77,7 +86,7 @@ ChallengeResponse(challenge, pwHash, response)
     char    ZPasswordHash[21];
 
     BZERO(ZPasswordHash, sizeof(ZPasswordHash));
-    BCOPY(pwHash, ZPasswordHash, 16);
+    BCOPY(pwHash, ZPasswordHash, MD4_SIGNATURE_SIZE);
 
 #if 0
     log_packet(ZPasswordHash, sizeof(ZPasswordHash), "ChallengeResponse - ZPasswordHash", LOG_DEBUG);
@@ -243,7 +252,8 @@ ChapMS_NT(rchallenge, rchallenge_len, secret, secret_len, response)
     MS_ChapResponse    *response;
 {
     int                        i;
-    MDstruct           md4Context;
+    MD4_CTX            md4Context;
+    u_short            hash[MD4_SIGNATURE_SIZE/sizeof(u_short)];
     u_char             unicodePassword[MAX_NT_PASSWORD * 2];
     static int         low_byte_first = -1;
 
@@ -253,23 +263,26 @@ ChapMS_NT(rchallenge, rchallenge_len, secret, secret_len, response)
     for (i = 0; i < secret_len; i++)
        unicodePassword[i * 2] = (u_char)secret[i];
 
-    MDbegin(&md4Context);
-    MDupdate(&md4Context, unicodePassword, secret_len * 2 * 8);        /* Unicode is 2 bytes/char, *8 for bit count */
+    MD4Init(&md4Context);
+    MD4Update(&md4Context, unicodePassword, secret_len * 2 * 8);       /* Unicode is 2 bytes/char, *8 for bit count */
+
+    MD4Final((u_char *) hash, &md4Context);    /* Tell MD4 we're done */
 
     if (low_byte_first == -1)
        low_byte_first = (htons((unsigned short int)1) != 1);
-    if (low_byte_first == 0)
-       MDreverse(&md4Context);  /*  sfb 961105 */
+    if (low_byte_first == 0) {
+       for (i = 0; i < MD4_SIGNATURE_SIZE; i += sizeof(u_short))
+               hash[i] = htons(hash[i]);
+    }
 
-    MDupdate(&md4Context, NULL, 0);    /* Tell MD4 we're done */
-
-    ChallengeResponse(rchallenge, (char *)md4Context.buffer, response->NTResp);
+    ChallengeResponse(rchallenge, (u_char *)hash, response->NTResp);
 }
 
 #ifdef MSLANMAN
 static u_char *StdText = (u_char *)"KGS!@#$%"; /* key from rasapi32.dll */
 
-static ChapMS_LANMan(rchallenge, rchallenge_len, secret, secret_len, response)
+static void
+ChapMS_LANMan(rchallenge, rchallenge_len, secret, secret_len, response)
     char *rchallenge;
     int rchallenge_len;
     char *secret;
@@ -278,7 +291,7 @@ static ChapMS_LANMan(rchallenge, rchallenge_len, secret, secret_len, response)
 {
     int                        i;
     u_char             UcasePassword[MAX_NT_PASSWORD]; /* max is actually 14 */
-    u_char             PasswordHash[16];
+    u_char             PasswordHash[MD4_SIGNATURE_SIZE];
 
     /* LANMan password is case insensitive */
     BZERO(UcasePassword, sizeof(UcasePassword));

diff --git a/pppd/chap_ms.h b/pppd/chap_ms.h
index 2d7c7e918b5af77f85f85f1855992017b3578d1d..1f0ea2b4e234e68a5a2df426821bb10668470fd4 100644 (file)
--- a/pppd/chap_ms.h
+++ b/pppd/chap_ms.h
@@ -19,11 +19,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap_ms.h,v 1.1 1996/05/28 00:42:31 paulus Exp $
+ * $Id: chap_ms.h,v 1.2 1997/11/27 06:08:10 paulus Exp $
  */
 
 #ifndef __CHAPMS_INCLUDE__
 
+#define MD4_SIGNATURE_SIZE     16      /* 16 bytes in a MD4 message digest */
 #define MAX_NT_PASSWORD        256     /* Maximum number of (Unicode) chars in an NT password */
 
 void ChapMS __P((chap_state *, char *, int, char *, int));