resolve conflicts

Approved by:	re (hrs)

1 files changed, 32 insertions, 6 deletions

diff --git a/contrib/hostapd/eap.h b/contrib/hostapd/eap.h
index ce49b07..8fb1ec3 100644
--- a/contrib/hostapd/eap.h
+++ b/contrib/hostapd/eap.h
@@ -1,18 +1,38 @@
 /* $FreeBSD$ */
 
+/*
+ * hostapd / EAP Standalone Authenticator state machine (RFC 4137)
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+
 #ifndef EAP_H
 #define EAP_H
 
 #include "defs.h"
 #include "eap_defs.h"
+#include "eap_methods.h"
 
 struct eap_sm;
 
 #define EAP_MAX_METHODS 8
 struct eap_user {
-	u8 methods[EAP_MAX_METHODS];
+	struct {
+		int vendor;
+		u32 method;
+	} methods[EAP_MAX_METHODS];
 	u8 *password;
 	size_t password_len;
+	int password_hash; /* whether password is hashed with
+			    * nt_password_hash() */
 	int phase2;
 	int force_version;
 };
@@ -48,10 +68,11 @@ struct eap_sm * eap_sm_init(void *eapol_ctx, struct eapol_callbacks *eapol_cb,
 			    struct eap_config *eap_conf);
 void eap_sm_deinit(struct eap_sm *sm);
 int eap_sm_step(struct eap_sm *sm);
-u8 eap_get_type(const char *name);
 void eap_set_eapRespData(struct eap_sm *sm, const u8 *eapRespData,
 			 size_t eapRespDataLen);
 void eap_sm_notify_cached(struct eap_sm *sm);
+void eap_sm_pending_cb(struct eap_sm *sm);
+int eap_sm_method_pending(struct eap_sm *sm);
 
 #else /* EAP_SERVER */
 
@@ -71,10 +92,6 @@ static inline int eap_sm_step(struct eap_sm *sm)
 	return 0;
 }
 
-static inline u8 eap_get_type(const char *name)
-{
-	return EAP_TYPE_NONE;
-}
 
 static inline void eap_set_eapRespData(struct eap_sm *sm,
 				       const u8 *eapRespData,
@@ -86,6 +103,15 @@ static inline void eap_sm_notify_cached(struct eap_sm *sm)
 {
 }
 
+static inline void eap_sm_pending_cb(struct eap_sm *sm)
+{
+}
+
+static inline int eap_sm_method_pending(struct eap_sm *sm)
+{
+	return 0;
+}
+
 #endif /* EAP_SERVER */
 
 #endif /* EAP_H */