Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / hostapd / eap_register.c

diff --git a/libeap/hostapd/eap_register.c b/libeap/hostapd/eap_register.c
index bab2871..8477c21 100644 (file)
--- a/libeap/hostapd/eap_register.c
+++ b/libeap/hostapd/eap_register.c
@@ -2,14 +2,8 @@
  * EAP method registration
  * Copyright (c) 2004-2009, 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.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
@@ -45,6 +39,18 @@ int eap_server_register_methods(void)
                ret = eap_server_tls_register();
 #endif /* EAP_SERVER_TLS */
 
+#ifdef EAP_SERVER_UNAUTH_TLS
+       if (ret == 0)
+               ret = eap_server_unauth_tls_register();
+#endif /* EAP_SERVER_TLS */
+
+#ifdef EAP_SERVER_TLS
+#ifdef CONFIG_HS20
+       if (ret == 0)
+               ret = eap_server_wfa_unauth_tls_register();
+#endif /* CONFIG_HS20 */
+#endif /* EAP_SERVER_TLS */
+
 #ifdef EAP_SERVER_MSCHAPV2
        if (ret == 0)
                ret = eap_server_mschapv2_register();
@@ -135,5 +141,10 @@ int eap_server_register_methods(void)
                ret = eap_server_pwd_register();
 #endif /* EAP_SERVER_PWD */
 
+#ifdef EAP_SERVER_EKE
+       if (ret == 0)
+               ret = eap_server_eke_register();
+#endif /* EAP_SERVER_EKE */
+
        return ret;
 }