Fix include paths for plugins to use the public API of pppd

[ppp.git] / pppd / chap_ms.h

diff --git a/pppd/chap_ms.h b/pppd/chap_ms.h
index 040d80adbeab088477df6239746979e7b937e622..c1c5ed846f5f5004f086de610a32ede41dc5a121 100644 (file)
--- a/pppd/chap_ms.h
+++ b/pppd/chap_ms.h
@@ -30,6 +30,8 @@
  * $Id: chap_ms.h,v 1.13 2004/11/15 22:13:26 paulus Exp $
  */
 
+#include "pppdconf.h"
+
 #ifndef __CHAPMS_INCLUDE__
 
 #define MD4_SIGNATURE_SIZE     16      /* 16 bytes in a MD4 message digest */
@@ -38,6 +40,7 @@
 #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, */
+#define MS_AUTH_NTRESP_LEN      24  /* Length of NT-response field */
                                        /* as ASCII */
 
 /* E=eeeeeeeeee error codes for MS-CHAP failure messages. */
@@ -67,36 +70,15 @@
 #define MS_CHAP2_NTRESP_LEN    24
 #define MS_CHAP2_FLAGS         48
 
-#ifdef MPPE
-#include "mppe.h"      /* MPPE_MAX_KEY_LEN */
-extern u_char mppe_send_key[MPPE_MAX_KEY_LEN];
-extern u_char mppe_recv_key[MPPE_MAX_KEY_LEN];
-extern int mppe_keys_set;
-
-/* These values are the RADIUS attribute values--see RFC 2548. */
-#define MPPE_ENC_POL_ENC_ALLOWED 1
-#define MPPE_ENC_POL_ENC_REQUIRED 2
-#define MPPE_ENC_TYPES_RC4_40 2
-#define MPPE_ENC_TYPES_RC4_128 4
-
-/* used by plugins (using above values) */
-extern void set_mppe_enc_types(int, int);
-#endif
-
 /* Are we the authenticator or authenticatee?  For MS-CHAPv2 key derivation. */
 #define MS_CHAP2_AUTHENTICATEE 0
 #define MS_CHAP2_AUTHENTICATOR 1
 
-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 ChapMS (u_char *, char *, int, u_char *);
+void ChapMS2 (u_char *, u_char *, char *, char *, int,
+             u_char *, u_char[MS_AUTH_RESPONSE_LENGTH+1], int);
 
-void   ChallengeHash __P((u_char[16], u_char *, char *, u_char[8]));
+void   ChallengeHash (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],