pppd: Fix spurious LCP echo failures with lcp-echo-adaptive option

[ppp.git] / pppd / mppe.h

diff --git a/pppd/mppe.h b/pppd/mppe.h
index 2684a7f6fe85801b44eb978faa5a88567a040ba5..f1c53c3201d1808d5533c61acd5d3ea745e1c792 100644 (file)
--- a/pppd/mppe.h
+++ b/pppd/mppe.h
@@ -32,10 +32,10 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include "pppdconf.h"
+#ifndef PPP_MPPE_H
+#define PPP_MPPE_H
 
-#ifndef __MPPE_H__
-#define __MPPE_H__
+#include "pppdconf.h"
 
 #define MPPE_PAD               4       /* MPPE growth per frame */
 #define MPPE_MAX_KEY_SIZE      32      /* Largest key length */
@@ -126,7 +126,7 @@
     } while (/* CONSTCOND */ 0)
 
 
-#if MPPE
+#if PPP_WITH_MPPE
 
 /*
  * NOTE:
@@ -179,13 +179,13 @@ bool mppe_keys_isset(void);
 /*
  * Set mppe_xxxx_key from NT Password Hash Hash (MSCHAPv1), see RFC3079
  */
-void mppe_set_chapv1(u_char *rchallenge, u_char PasswordHashHash[MD4_SIGNATURE_SIZE]);
+void mppe_set_chapv1(unsigned char *rchallenge, unsigned char *PasswordHashHash);
 
 /*
  * Set the mppe_xxxx_key from MS-CHAP-v2 credentials, see RFC3079
  */
-void mppe_set_chapv2(u_char PasswordHashHash[MD4_SIGNATURE_SIZE],
-                   u_char NTResponse[MS_AUTH_NTRESP_LEN], int IsServer);
+void mppe_set_chapv2(unsigned char *PasswordHashHash,
+                   unsigned char *NTResponse, int IsServer);
 
-#endif  // #ifdef MPPE
-#endif  // #ifdef __MPPE_H__
+#endif  // #ifdef PPP_WITH_MPPE
+#endif  // #ifdef PPP_MPPE_H