Move EAP method registration away from src/eap_{peer,server}
This makes it easier to make a library out of EAP methods without losing possiblity of binary size optimization by linker dropping unreferenced code.
This commit is contained in:
Jouni Malinen
parent
2d106f21aa
commit
127608152e
16 changed files with 654 additions and 325 deletions
|
|
@ -339,161 +339,6 @@ int eap_peer_method_register(struct eap_method *method)
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* eap_peer_register_methods - Register statically linked EAP peer methods
|
||||
* Returns: 0 on success, -1 on failure
|
||||
*
|
||||
* This function is called at program initialization to register all EAP peer
|
||||
* methods that were linked in statically.
|
||||
*/
|
||||
int eap_peer_register_methods(void)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
#ifdef EAP_MD5
|
||||
if (ret == 0) {
|
||||
int eap_peer_md5_register(void);
|
||||
ret = eap_peer_md5_register();
|
||||
}
|
||||
#endif /* EAP_MD5 */
|
||||
|
||||
#ifdef EAP_TLS
|
||||
if (ret == 0) {
|
||||
int eap_peer_tls_register(void);
|
||||
ret = eap_peer_tls_register();
|
||||
}
|
||||
#endif /* EAP_TLS */
|
||||
|
||||
#ifdef EAP_MSCHAPv2
|
||||
if (ret == 0) {
|
||||
int eap_peer_mschapv2_register(void);
|
||||
ret = eap_peer_mschapv2_register();
|
||||
}
|
||||
#endif /* EAP_MSCHAPv2 */
|
||||
|
||||
#ifdef EAP_PEAP
|
||||
if (ret == 0) {
|
||||
int eap_peer_peap_register(void);
|
||||
ret = eap_peer_peap_register();
|
||||
}
|
||||
#endif /* EAP_PEAP */
|
||||
|
||||
#ifdef EAP_TTLS
|
||||
if (ret == 0) {
|
||||
int eap_peer_ttls_register(void);
|
||||
ret = eap_peer_ttls_register();
|
||||
}
|
||||
#endif /* EAP_TTLS */
|
||||
|
||||
#ifdef EAP_GTC
|
||||
if (ret == 0) {
|
||||
int eap_peer_gtc_register(void);
|
||||
ret = eap_peer_gtc_register();
|
||||
}
|
||||
#endif /* EAP_GTC */
|
||||
|
||||
#ifdef EAP_OTP
|
||||
if (ret == 0) {
|
||||
int eap_peer_otp_register(void);
|
||||
ret = eap_peer_otp_register();
|
||||
}
|
||||
#endif /* EAP_OTP */
|
||||
|
||||
#ifdef EAP_SIM
|
||||
if (ret == 0) {
|
||||
int eap_peer_sim_register(void);
|
||||
ret = eap_peer_sim_register();
|
||||
}
|
||||
#endif /* EAP_SIM */
|
||||
|
||||
#ifdef EAP_LEAP
|
||||
if (ret == 0) {
|
||||
int eap_peer_leap_register(void);
|
||||
ret = eap_peer_leap_register();
|
||||
}
|
||||
#endif /* EAP_LEAP */
|
||||
|
||||
#ifdef EAP_PSK
|
||||
if (ret == 0) {
|
||||
int eap_peer_psk_register(void);
|
||||
ret = eap_peer_psk_register();
|
||||
}
|
||||
#endif /* EAP_PSK */
|
||||
|
||||
#ifdef EAP_AKA
|
||||
if (ret == 0) {
|
||||
int eap_peer_aka_register(void);
|
||||
ret = eap_peer_aka_register();
|
||||
}
|
||||
#endif /* EAP_AKA */
|
||||
|
||||
#ifdef EAP_AKA_PRIME
|
||||
if (ret == 0) {
|
||||
int eap_peer_aka_prime_register(void);
|
||||
ret = eap_peer_aka_prime_register();
|
||||
}
|
||||
#endif /* EAP_AKA_PRIME */
|
||||
|
||||
#ifdef EAP_FAST
|
||||
if (ret == 0) {
|
||||
int eap_peer_fast_register(void);
|
||||
ret = eap_peer_fast_register();
|
||||
}
|
||||
#endif /* EAP_FAST */
|
||||
|
||||
#ifdef EAP_PAX
|
||||
if (ret == 0) {
|
||||
int eap_peer_pax_register(void);
|
||||
ret = eap_peer_pax_register();
|
||||
}
|
||||
#endif /* EAP_PAX */
|
||||
|
||||
#ifdef EAP_SAKE
|
||||
if (ret == 0) {
|
||||
int eap_peer_sake_register(void);
|
||||
ret = eap_peer_sake_register();
|
||||
}
|
||||
#endif /* EAP_SAKE */
|
||||
|
||||
#ifdef EAP_GPSK
|
||||
if (ret == 0) {
|
||||
int eap_peer_gpsk_register(void);
|
||||
ret = eap_peer_gpsk_register();
|
||||
}
|
||||
#endif /* EAP_GPSK */
|
||||
|
||||
#ifdef EAP_WSC
|
||||
if (ret == 0) {
|
||||
int eap_peer_wsc_register(void);
|
||||
ret = eap_peer_wsc_register();
|
||||
}
|
||||
#endif /* EAP_WSC */
|
||||
|
||||
#ifdef EAP_IKEV2
|
||||
if (ret == 0) {
|
||||
int eap_peer_ikev2_register(void);
|
||||
ret = eap_peer_ikev2_register();
|
||||
}
|
||||
#endif /* EAP_IKEV2 */
|
||||
|
||||
#ifdef EAP_VENDOR_TEST
|
||||
if (ret == 0) {
|
||||
int eap_peer_vendor_test_register(void);
|
||||
ret = eap_peer_vendor_test_register();
|
||||
}
|
||||
#endif /* EAP_VENDOR_TEST */
|
||||
|
||||
#ifdef EAP_TNC
|
||||
if (ret == 0) {
|
||||
int eap_peer_tnc_register(void);
|
||||
ret = eap_peer_tnc_register();
|
||||
}
|
||||
#endif /* EAP_TNC */
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* eap_peer_unregister_methods - Unregister EAP peer methods
|
||||
*
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ EapType eap_peer_get_type(const char *name, int *vendor);
|
|||
const char * eap_get_name(int vendor, EapType type);
|
||||
size_t eap_get_names(char *buf, size_t buflen);
|
||||
char ** eap_get_names_as_string_array(size_t *num);
|
||||
int eap_peer_register_methods(void);
|
||||
void eap_peer_unregister_methods(void);
|
||||
|
||||
#else /* IEEE8021X_EAPOL */
|
||||
|
|
@ -89,4 +88,26 @@ static inline int eap_peer_method_unload(struct eap_method *method)
|
|||
|
||||
#endif /* CONFIG_DYNAMIC_EAP_METHODS */
|
||||
|
||||
/* EAP peer method registration calls for statically linked in methods */
|
||||
int eap_peer_md5_register(void);
|
||||
int eap_peer_tls_register(void);
|
||||
int eap_peer_mschapv2_register(void);
|
||||
int eap_peer_peap_register(void);
|
||||
int eap_peer_ttls_register(void);
|
||||
int eap_peer_gtc_register(void);
|
||||
int eap_peer_otp_register(void);
|
||||
int eap_peer_sim_register(void);
|
||||
int eap_peer_leap_register(void);
|
||||
int eap_peer_psk_register(void);
|
||||
int eap_peer_aka_register(void);
|
||||
int eap_peer_aka_prime_register(void);
|
||||
int eap_peer_fast_register(void);
|
||||
int eap_peer_pax_register(void);
|
||||
int eap_peer_sake_register(void);
|
||||
int eap_peer_gpsk_register(void);
|
||||
int eap_peer_wsc_register(void);
|
||||
int eap_peer_ikev2_register(void);
|
||||
int eap_peer_vendor_test_register(void);
|
||||
int eap_peer_tnc_register(void);
|
||||
|
||||
#endif /* EAP_METHODS_H */
|
||||
|
|
|
|||
|
|
@ -133,159 +133,6 @@ int eap_server_method_register(struct eap_method *method)
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* eap_server_register_methods - Register statically linked EAP server methods
|
||||
* Returns: 0 on success, -1 on failure
|
||||
*
|
||||
* This function is called at program initialization to register all EAP server
|
||||
* methods that were linked in statically.
|
||||
*/
|
||||
int eap_server_register_methods(void)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (ret == 0) {
|
||||
int eap_server_identity_register(void);
|
||||
ret = eap_server_identity_register();
|
||||
}
|
||||
|
||||
#ifdef EAP_SERVER_MD5
|
||||
if (ret == 0) {
|
||||
int eap_server_md5_register(void);
|
||||
ret = eap_server_md5_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_MD5 */
|
||||
|
||||
#ifdef EAP_SERVER_TLS
|
||||
if (ret == 0) {
|
||||
int eap_server_tls_register(void);
|
||||
ret = eap_server_tls_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_TLS */
|
||||
|
||||
#ifdef EAP_SERVER_MSCHAPV2
|
||||
if (ret == 0) {
|
||||
int eap_server_mschapv2_register(void);
|
||||
ret = eap_server_mschapv2_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_MSCHAPV2 */
|
||||
|
||||
#ifdef EAP_SERVER_PEAP
|
||||
if (ret == 0) {
|
||||
int eap_server_peap_register(void);
|
||||
ret = eap_server_peap_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_PEAP */
|
||||
|
||||
#ifdef EAP_SERVER_TLV
|
||||
if (ret == 0) {
|
||||
int eap_server_tlv_register(void);
|
||||
ret = eap_server_tlv_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_TLV */
|
||||
|
||||
#ifdef EAP_SERVER_GTC
|
||||
if (ret == 0) {
|
||||
int eap_server_gtc_register(void);
|
||||
ret = eap_server_gtc_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_GTC */
|
||||
|
||||
#ifdef EAP_SERVER_TTLS
|
||||
if (ret == 0) {
|
||||
int eap_server_ttls_register(void);
|
||||
ret = eap_server_ttls_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_TTLS */
|
||||
|
||||
#ifdef EAP_SERVER_SIM
|
||||
if (ret == 0) {
|
||||
int eap_server_sim_register(void);
|
||||
ret = eap_server_sim_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_SIM */
|
||||
|
||||
#ifdef EAP_SERVER_AKA
|
||||
if (ret == 0) {
|
||||
int eap_server_aka_register(void);
|
||||
ret = eap_server_aka_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_AKA */
|
||||
|
||||
#ifdef EAP_SERVER_AKA_PRIME
|
||||
if (ret == 0) {
|
||||
int eap_server_aka_prime_register(void);
|
||||
ret = eap_server_aka_prime_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_AKA_PRIME */
|
||||
|
||||
#ifdef EAP_SERVER_PAX
|
||||
if (ret == 0) {
|
||||
int eap_server_pax_register(void);
|
||||
ret = eap_server_pax_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_PAX */
|
||||
|
||||
#ifdef EAP_SERVER_PSK
|
||||
if (ret == 0) {
|
||||
int eap_server_psk_register(void);
|
||||
ret = eap_server_psk_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_PSK */
|
||||
|
||||
#ifdef EAP_SERVER_SAKE
|
||||
if (ret == 0) {
|
||||
int eap_server_sake_register(void);
|
||||
ret = eap_server_sake_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_SAKE */
|
||||
|
||||
#ifdef EAP_SERVER_GPSK
|
||||
if (ret == 0) {
|
||||
int eap_server_gpsk_register(void);
|
||||
ret = eap_server_gpsk_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_GPSK */
|
||||
|
||||
#ifdef EAP_SERVER_VENDOR_TEST
|
||||
if (ret == 0) {
|
||||
int eap_server_vendor_test_register(void);
|
||||
ret = eap_server_vendor_test_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_VENDOR_TEST */
|
||||
|
||||
#ifdef EAP_SERVER_FAST
|
||||
if (ret == 0) {
|
||||
int eap_server_fast_register(void);
|
||||
ret = eap_server_fast_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_FAST */
|
||||
|
||||
#ifdef EAP_SERVER_WSC
|
||||
if (ret == 0) {
|
||||
int eap_server_wsc_register(void);
|
||||
ret = eap_server_wsc_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_WSC */
|
||||
|
||||
#ifdef EAP_SERVER_IKEV2
|
||||
if (ret == 0) {
|
||||
int eap_server_ikev2_register(void);
|
||||
ret = eap_server_ikev2_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_IKEV2 */
|
||||
|
||||
#ifdef EAP_SERVER_TNC
|
||||
if (ret == 0) {
|
||||
int eap_server_tnc_register(void);
|
||||
ret = eap_server_tnc_register();
|
||||
}
|
||||
#endif /* EAP_SERVER_TNC */
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* eap_server_unregister_methods - Unregister EAP server methods
|
||||
*
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
#ifndef EAP_SERVER_METHODS_H
|
||||
#define EAP_SERVER_METHODS_H
|
||||
|
||||
#include "eap_common/eap_defs.h"
|
||||
|
||||
const struct eap_method * eap_server_get_eap_method(int vendor,
|
||||
EapType method);
|
||||
struct eap_method * eap_server_method_alloc(int version, int vendor,
|
||||
|
|
@ -23,8 +25,29 @@ void eap_server_method_free(struct eap_method *method);
|
|||
int eap_server_method_register(struct eap_method *method);
|
||||
|
||||
EapType eap_server_get_type(const char *name, int *vendor);
|
||||
int eap_server_register_methods(void);
|
||||
void eap_server_unregister_methods(void);
|
||||
const char * eap_server_get_name(int vendor, EapType type);
|
||||
|
||||
/* EAP server method registration calls for statically linked in methods */
|
||||
int eap_server_identity_register(void);
|
||||
int eap_server_md5_register(void);
|
||||
int eap_server_tls_register(void);
|
||||
int eap_server_mschapv2_register(void);
|
||||
int eap_server_peap_register(void);
|
||||
int eap_server_tlv_register(void);
|
||||
int eap_server_gtc_register(void);
|
||||
int eap_server_ttls_register(void);
|
||||
int eap_server_sim_register(void);
|
||||
int eap_server_aka_register(void);
|
||||
int eap_server_aka_prime_register(void);
|
||||
int eap_server_pax_register(void);
|
||||
int eap_server_psk_register(void);
|
||||
int eap_server_sake_register(void);
|
||||
int eap_server_gpsk_register(void);
|
||||
int eap_server_vendor_test_register(void);
|
||||
int eap_server_fast_register(void);
|
||||
int eap_server_wsc_register(void);
|
||||
int eap_server_ikev2_register(void);
|
||||
int eap_server_tnc_register(void);
|
||||
|
||||
#endif /* EAP_SERVER_METHODS_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue