Get rid of the MS_ChapResponse and MS_Chap2Response structures.

[ppp.git] / pppd / chap_ms.h

diff --git a/pppd/chap_ms.h b/pppd/chap_ms.h
index 251a4ba01de1f78826f4aee98f8978634c906a0c..57e2929373695159be2baa1622f1675b75081fbf 100644 (file)
--- a/pppd/chap_ms.h
+++ b/pppd/chap_ms.h
@@ -27,7 +27,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: chap_ms.h,v 1.9 2002/12/24 03:43:35 fcusack Exp $
+ * $Id: chap_ms.h,v 1.13 2004/11/15 22:13:26 paulus Exp $
  */
 
 #ifndef __CHAPMS_INCLUDE__
@@ -37,6 +37,8 @@
 
 #define MS_CHAP_RESPONSE_LEN   49      /* Response length for MS-CHAP */
 #define MS_CHAP2_RESPONSE_LEN  49      /* Response length for MS-CHAPv2 */
+#define MS_AUTH_RESPONSE_LENGTH        40      /* MS-CHAPv2 authenticator response, */
+                                       /* as ASCII */
 
 /* E=eeeeeeeeee error codes for MS-CHAP failure messages. */
 #define MS_CHAP_ERROR_RESTRICTED_LOGON_HOURS   646
@@ -47,25 +49,23 @@
 #define MS_CHAP_ERROR_CHANGING_PASSWORD                709
 
 /*
- * Use MS_CHAP_RESPONSE_LEN, rather than sizeof(MS_ChapResponse),
- * in case this struct gets padded.
+ * Offsets within the response field for MS-CHAP
  */
-typedef struct {
-    u_char LANManResp[24];
-    u_char NTResp[24];
-    u_char UseNT[1];           /* If 1, ignore the LANMan response field */
-} MS_ChapResponse;
+#define MS_CHAP_LANMANRESP     0
+#define MS_CHAP_LANMANRESP_LEN 24
+#define MS_CHAP_NTRESP         24
+#define MS_CHAP_NTRESP_LEN     24
+#define MS_CHAP_USENT          48
 
 /*
- * Use MS_CHAP2_RESPONSE_LEN, rather than sizeof(MS_Chap2Response),
- * in case this struct gets padded.
+ * Offsets within the response field for MS-CHAP2
  */
-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;
+#define MS_CHAP2_PEER_CHALLENGE        0
+#define MS_CHAP2_PEER_CHAL_LEN 16
+#define MS_CHAP2_RESERVED_LEN  8
+#define MS_CHAP2_NTRESP                24
+#define MS_CHAP2_NTRESP_LEN    24
+#define MS_CHAP2_FLAGS         48
 
 #ifdef MPPE
 #include <net/ppp-comp.h>      /* MPPE_MAX_KEY_LEN */
@@ -87,13 +87,23 @@ extern void set_mppe_enc_types(int, int);
 #define MS_CHAP2_AUTHENTICATEE 0
 #define MS_CHAP2_AUTHENTICATOR 1
 
-#include "chap.h" /* chap_state, et al */
-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], int));
+void ChapMS __P((u_char *, char *, int, u_char *));
+void ChapMS2 __P((u_char *, u_char *, char *, char *, int,
+                 u_char *, u_char[MS_AUTH_RESPONSE_LENGTH+1], int));
 #ifdef MPPE
 void mppe_set_keys __P((u_char *, u_char[MD4_SIGNATURE_SIZE]));
+void mppe_set_keys2(u_char PasswordHashHash[MD4_SIGNATURE_SIZE],
+                   u_char NTResponse[24], int IsServer);
 #endif
 
+void   ChallengeHash __P((u_char[16], u_char *, char *, u_char[8]));
+
+void GenerateAuthenticatorResponse(u_char PasswordHashHash[MD4_SIGNATURE_SIZE],
+                       u_char NTResponse[24], u_char PeerChallenge[16],
+                       u_char *rchallenge, char *username,
+                       u_char authResponse[MS_AUTH_RESPONSE_LENGTH+1]);
+
+void chapms_init(void);
+
 #define __CHAPMS_INCLUDE__
 #endif /* __CHAPMS_INCLUDE__ */