Patch from Frank Cusack to add support for MSCHAPv2.

[ppp.git] / pppd / chap_ms.h

diff --git a/pppd/chap_ms.h b/pppd/chap_ms.h
index 4418c9305f160e7b9c8c45f403c9e5a3eb1692ae..a8a13950ab5f3448c2392e0a2939a2ba2bf40235 100644 (file)
--- a/pppd/chap_ms.h
+++ b/pppd/chap_ms.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap_ms.h,v 1.4 2002/03/04 14:59:51 dfs Exp $
+ * $Id: chap_ms.h,v 1.5 2002/03/05 15:14:04 dfs Exp $
  */
 
 #ifndef __CHAPMS_INCLUDE__
@@ -28,6 +28,19 @@
 #define MAX_NT_PASSWORD                256     /* Max (Unicode) chars in an NT pass */
 
 #define MS_CHAP_RESPONSE_LEN   49      /* Response length for MS-CHAP */
+#define MS_CHAP2_RESPONSE_LEN  49      /* Response length for MS-CHAPv2 */
+
+/*
+ * E=eeeeeeeeee error codes for MS-CHAP failure messages. 
+ * Offset by 646 (the minimum code) for switch() handling on older compilers.
+ */
+#define MS_CHAP_ERROR_BASE                     646
+#define MS_CHAP_ERROR_RESTRICTED_LOGON_HOURS   (646 - MS_CHAP_ERROR_BASE)
+#define MS_CHAP_ERROR_ACCT_DISABLED            (647 - MS_CHAP_ERROR_BASE)
+#define MS_CHAP_ERROR_PASSWD_EXPIRED           (648 - MS_CHAP_ERROR_BASE)
+#define MS_CHAP_ERROR_NO_DIALIN_PERMISSION     (649 - MS_CHAP_ERROR_BASE)
+#define MS_CHAP_ERROR_AUTHENTICATION_FAILURE   (691 - MS_CHAP_ERROR_BASE)
+#define MS_CHAP_ERROR_CHANGING_PASSWORD                (709 - MS_CHAP_ERROR_BASE)
 
 /*
  * Use MS_CHAP_RESPONSE_LEN, rather than sizeof(MS_ChapResponse),
@@ -39,7 +52,20 @@ typedef struct {
     u_char UseNT[1];           /* If 1, ignore the LANMan response field */
 } MS_ChapResponse;
 
-void ChapMS __P((chap_state *, char *, int, char *, int));
+/*
+ * Use MS_CHAP2_RESPONSE_LEN, rather than sizeof(MS_Chap2Response),
+ * in case this struct gets padded.
+ */
+typedef struct {
+    u_char PeerChallenge[16];
+    u_char Reserved[8];                /* Must be zero */
+    u_char NTResp[24];
+    u_char Flags[1];           /* Must be zero */
+} MS_Chap2Response;
+
+void ChapMS __P((chap_state *, u_char *, char *, int, MS_ChapResponse *));
+void ChapMS2 __P((chap_state *, u_char *, u_char *, char *, char *, int,
+                 MS_Chap2Response *, u_char[MS_AUTH_RESPONSE_LENGTH+1]));
 
 #define __CHAPMS_INCLUDE__
 #endif /* __CHAPMS_INCLUDE__ */