DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Rename EAP server defines from EAP_* to EAP_SERVER_*

Browse source 
This allows separate set of EAP server and peer methods to be built into
a single binary.
This commit is contained in:
Jouni Malinen 2009-03-25 12:06:19 +02:00 • committed by Jouni Malinen
parent 1581b38b67
commit 1e5839e06f
19 changed files with 145 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/crypto/crypto_internal.c
View file

@ -791,7 +791,7 @@ void crypto_global_deinit(void)
#endif /* CONFIG_TLS_INTERNAL */
#if defined(EAP_FAST) || defined(CONFIG_WPS)
#if defined(EAP_FAST) || defined(EAP_SERVER_FAST) || defined(CONFIG_WPS)
int crypto_mod_exp(const u8 *base, size_t base_len,
const u8 *power, size_t power_len,
@ -828,7 +828,7 @@ error:
return ret;
}
#endif /* EAP_FAST || CONFIG_WPS */
#endif /* EAP_FAST || EAP_SERVER_FAST || CONFIG_WPS */
#endif /* CONFIG_CRYPTO_INTERNAL */

4
src/crypto/crypto_libtomcrypt.c
View file

@ -697,7 +697,7 @@ void crypto_global_deinit(void)
}
#ifdef EAP_FAST
#if defined(EAP_FAST) || defined(EAP_SERVER_FAST)
int crypto_mod_exp(const u8 *base, size_t base_len,
const u8 *power, size_t power_len,
@ -729,7 +729,7 @@ fail:
return -1;
}
#endif /* EAP_FAST */
#endif /* EAP_FAST || EAP_SERVER_FAST */
#endif /* CONFIG_TLS_INTERNAL */

14
src/crypto/tls_openssl.c
View file

@ -2339,7 +2339,7 @@ int tls_connection_enable_workaround(void *ssl_ctx,
}
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC)
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
/* ClientHello TLS extensions require a patch to openssl, so this function is
* commented out unless explicitly needed for EAP-FAST in order to be able to
* build this file with unmodified openssl. */
@ -2362,7 +2362,7 @@ int tls_connection_client_hello_ext(void *ssl_ctx, struct tls_connection *conn,
return 0;
}
#endif /* EAP_FAST || EAP_FAST_DYNAMIC */
#endif /* EAP_FAST || EAP_FAST_DYNAMIC || EAP_SERVER_FAST */
int tls_connection_get_failed(void *ssl_ctx, struct tls_connection *conn)
@ -2553,7 +2553,7 @@ int tls_connection_ia_permute_inner_secret(void *tls_ctx,
}
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC)
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
/* Pre-shared secred requires a patch to openssl, so this function is
* commented out unless explicitly needed for EAP-FAST in order to be able to
* build this file with unmodified openssl. */
@ -2666,7 +2666,7 @@ static int tls_hello_ext_cb(SSL *s, TLS_EXTENSION *ext, void *arg)
}
#endif /* SSL_OP_NO_TICKET */
#endif /* CONFIG_OPENSSL_TICKET_OVERRIDE */
#endif /* EAP_FAST || EAP_FAST_DYNAMIC */
#endif /* EAP_FAST || EAP_FAST_DYNAMIC || EAP_SERVER_FAST */
int tls_connection_set_session_ticket_cb(void *tls_ctx,
@ -2674,7 +2674,7 @@ int tls_connection_set_session_ticket_cb(void *tls_ctx,
tls_session_ticket_cb cb,
void *ctx)
{
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC)
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
conn->session_ticket_cb = cb;
conn->session_ticket_cb_ctx = ctx;
@ -2712,7 +2712,7 @@ int tls_connection_set_session_ticket_cb(void *tls_ctx,
}
return 0;
#else /* EAP_FAST || EAP_FAST_DYNAMIC */
#else /* EAP_FAST || EAP_FAST_DYNAMIC || EAP_SERVER_FAST */
return -1;
#endif /* EAP_FAST || EAP_FAST_DYNAMIC */
#endif /* EAP_FAST || EAP_FAST_DYNAMIC || EAP_SERVER_FAST */
}