X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=inline;f=pppd%2Fchap_ms.h;h=a8a13950ab5f3448c2392e0a2939a2ba2bf40235;hb=da44517ffef30eb2c170bb97cd6435f6d4e61a0e;hp=e673f8aa24f9730efebc7368bbd9163412442a10;hpb=c062322f9e8757b85a3c2281a3190d8af14bcd9b;p=ppp.git

diff --git a/pppd/chap_ms.h b/pppd/chap_ms.h
index e673f8a..a8a1395 100644
--- 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.3 2002/03/01 14:39:18 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),
@@ -36,10 +49,23 @@
 typedef struct {
     u_char LANManResp[24];
     u_char NTResp[24];
-    u_char UseNT;		/* If 1, ignore the LANMan response field */
+    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__ */