Rename EAP server defines from EAP_* to EAP_SERVER_*
This allows separate set of EAP server and peer methods to be built into a single binary.
This commit is contained in:
parent
1581b38b67
commit
1e5839e06f
19 changed files with 145 additions and 145 deletions
|
@ -546,7 +546,7 @@ int tlsv1_server_get_keyblock_size(struct tlsv1_server *conn)
|
|||
*/
|
||||
int tlsv1_server_set_cipher_list(struct tlsv1_server *conn, u8 *ciphers)
|
||||
{
|
||||
#ifdef EAP_FAST
|
||||
#ifdef EAP_SERVER_FAST
|
||||
size_t count;
|
||||
u16 *suites;
|
||||
|
||||
|
@ -572,9 +572,9 @@ int tlsv1_server_set_cipher_list(struct tlsv1_server *conn, u8 *ciphers)
|
|||
}
|
||||
|
||||
return 0;
|
||||
#else /* EAP_FAST */
|
||||
#else /* EAP_SERVER_FAST */
|
||||
return -1;
|
||||
#endif /* EAP_FAST */
|
||||
#endif /* EAP_SERVER_FAST */
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -571,7 +571,7 @@ static int tls_process_client_key_exchange_rsa(
|
|||
static int tls_process_client_key_exchange_dh_anon(
|
||||
struct tlsv1_server *conn, const u8 *pos, const u8 *end)
|
||||
{
|
||||
#ifdef EAP_FAST
|
||||
#ifdef EAP_SERVER_FAST
|
||||
const u8 *dh_yc;
|
||||
u16 dh_yc_len;
|
||||
u8 *shared;
|
||||
|
@ -669,9 +669,9 @@ static int tls_process_client_key_exchange_dh_anon(
|
|||
}
|
||||
|
||||
return 0;
|
||||
#else /* EAP_FAST */
|
||||
#else /* EAP_SERVER_FAST */
|
||||
return -1;
|
||||
#endif /* EAP_FAST */
|
||||
#endif /* EAP_SERVER_FAST */
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -247,12 +247,12 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
|
|||
{
|
||||
tls_key_exchange keyx;
|
||||
const struct tls_cipher_suite *suite;
|
||||
#ifdef EAP_FAST
|
||||
#ifdef EAP_SERVER_FAST
|
||||
u8 *pos, *rhdr, *hs_start, *hs_length;
|
||||
size_t rlen;
|
||||
u8 *dh_ys;
|
||||
size_t dh_ys_len;
|
||||
#endif /* EAP_FAST */
|
||||
#endif /* EAP_SERVER_FAST */
|
||||
|
||||
suite = tls_get_cipher_suite(conn->rl.cipher_suite);
|
||||
if (suite == NULL)
|
||||
|
@ -272,7 +272,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
|
|||
return -1;
|
||||
}
|
||||
|
||||
#ifdef EAP_FAST
|
||||
#ifdef EAP_SERVER_FAST
|
||||
if (conn->cred == NULL || conn->cred->dh_p == NULL ||
|
||||
conn->cred->dh_g == NULL) {
|
||||
wpa_printf(MSG_DEBUG, "TLSv1: No DH parameters available for "
|
||||
|
@ -433,9 +433,9 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
|
|||
*msgpos = pos;
|
||||
|
||||
return 0;
|
||||
#else /* EAP_FAST */
|
||||
#else /* EAP_SERVER_FAST */
|
||||
return -1;
|
||||
#endif /* EAP_FAST */
|
||||
#endif /* EAP_SERVER_FAST */
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue