New attribute provider SPI

[mech_eap.orig] / eap_mech.c

diff --git a/eap_mech.c b/eap_mech.c
index da3de43..fb149e0 100644 (file)
--- a/eap_mech.c
+++ b/eap_mech.c
@@ -32,10 +32,10 @@
 
 #include "gssapiP_eap.h"
 
-static int
-eapPeerRegisterMethods(void)
+static OM_uint32
+eapPeerRegisterMethods(OM_uint32 *minor)
 {
-    int ret = 0;
+    OM_uint32 ret = 0;
 
 #ifdef EAP_MD5
     if (ret == 0)
@@ -137,19 +137,126 @@ eapPeerRegisterMethods(void)
         ret = eap_peer_tnc_register();
 #endif /* EAP_TNC */
 
-    return ret;
+    return ret ? GSS_S_FAILURE : GSS_S_COMPLETE;
 }
 
-static int
-gssEapInitLibEap(void)
+static OM_uint32
+eapServerRegisterMethods(OM_uint32 *minor)
 {
-    return eapPeerRegisterMethods();
+    OM_uint32 ret = 0;
+
+#ifdef EAP_SERVER_IDENTITY
+    if (ret == 0)
+        ret = eap_server_identity_register();
+#endif /* EAP_SERVER_IDENTITY */
+
+#ifdef EAP_SERVER_MD5
+    if (ret == 0)
+        ret = eap_server_md5_register();
+#endif /* EAP_SERVER_MD5 */
+
+#ifdef EAP_SERVER_TLS
+    if (ret == 0)
+        ret = eap_server_tls_register();
+#endif /* EAP_SERVER_TLS */
+
+#ifdef EAP_SERVER_MSCHAPV2
+    if (ret == 0)
+        ret = eap_server_mschapv2_register();
+#endif /* EAP_SERVER_MSCHAPV2 */
+
+#ifdef EAP_SERVER_PEAP
+    if (ret == 0)
+        ret = eap_server_peap_register();
+#endif /* EAP_SERVER_PEAP */
+
+#ifdef EAP_SERVER_TLV
+    if (ret == 0)
+        ret = eap_server_tlv_register();
+#endif /* EAP_SERVER_TLV */
+#ifdef EAP_SERVER_GTC
+    if (ret == 0)
+        ret = eap_server_gtc_register();
+#endif /* EAP_SERVER_GTC */
+
+#ifdef EAP_SERVER_TTLS
+    if (ret == 0)
+        ret = eap_server_ttls_register();
+#endif /* EAP_SERVER_TTLS */
+
+#ifdef EAP_SERVER_SIM
+    if (ret == 0)
+        ret = eap_server_sim_register();
+#endif /* EAP_SERVER_SIM */
+
+#ifdef EAP_SERVER_AKA
+    if (ret == 0)
+        ret = eap_server_aka_register();
+#endif /* EAP_SERVER_AKA */
+
+#ifdef EAP_SERVER_AKA_PRIME
+    if (ret == 0)
+        ret = eap_server_aka_prime_register();
+#endif /* EAP_SERVER_AKA_PRIME */
+
+#ifdef EAP_SERVER_PAX
+    if (ret == 0)
+        ret = eap_server_pax_register();
+#endif /* EAP_SERVER_PAX */
+
+#ifdef EAP_SERVER_PSK
+    if (ret == 0)
+        ret = eap_server_psk_register();
+#endif /* EAP_SERVER_PSK */
+
+#ifdef EAP_SERVER_SAKE
+    if (ret == 0)
+        ret = eap_server_sake_register();
+#endif /* EAP_SERVER_SAKE */
+
+#ifdef EAP_SERVER_GPSK
+    if (ret == 0)
+        ret = eap_server_gpsk_register();
+#endif /* EAP_SERVER_GPSK */
+
+#ifdef EAP_SERVER_VENDOR_TEST
+    if (ret == 0)
+        ret = eap_server_vendor_test_register();
+#endif /* EAP_SERVER_VENDOR_TEST */
+
+#ifdef EAP_SERVER_FAST
+    if (ret == 0)
+        ret = eap_server_fast_register();
+#endif /* EAP_SERVER_FAST */
+
+#ifdef EAP_SERVER_WSC
+    if (ret == 0)
+        ret = eap_server_wsc_register();
+#endif /* EAP_SERVER_WSC */
+
+#ifdef EAP_SERVER_IKEV2
+    if (ret == 0)
+        ret = eap_server_ikev2_register();
+#endif /* EAP_SERVER_IKEV2 */
+
+#ifdef EAP_SERVER_TNC
+    if (ret == 0)
+        ret = eap_server_tnc_register();
+#endif /* EAP_SERVER_TNC */
+
+    return ret ? GSS_S_FAILURE : GSS_S_COMPLETE;
 }
 
-static int
-gssEapInitLibRadSec(void)
+static OM_uint32
+gssEapInitLibEap(OM_uint32 *minor)
 {
-    return 0;
+    return eapPeerRegisterMethods(minor);
+}
+
+static OM_uint32
+gssEapInitLibRadSec(OM_uint32 *minor)
+{
+    return GSS_S_COMPLETE;
 }
 
 static void gssEapInit(void) __attribute__((constructor));
@@ -158,16 +265,23 @@ static void gssEapFinalize(void) __attribute__((destructor));
 static void
 gssEapInit(void)
 {
-    int ret;
+    OM_uint32 major, minor;
 
-    ret = gssEapInitLibEap();
-    if (ret == 0)
-        gssEapInitLibRadSec();
+    gssEapInitLibEap(&minor);
+    gssEapInitLibRadSec(&minor);
+    eapServerRegisterMethods(&minor);
+    gssEapAttrProvidersInit(&minor);
 }
 
 static void
 gssEapFinalize(void)
 {
+    OM_uint32 major, minor;
+
     eap_peer_unregister_methods();
+#if 1
+    eap_server_unregister_methods();
+#endif
+    gssEapAttrProvidersFinalize(&minor);
 }