diff options
author | Jouni Malinen <jouni.malinen@atheros.com> | 2009-03-25 12:06:19 +0200 |
---|---|---|
committer | Jouni Malinen <j@w1.fi> | 2009-03-25 12:06:19 +0200 |
commit | 1e5839e06fbc20945044239984b652da9c3fc772 (patch) | |
tree | 4574b2edd584e691073f4d2e2d6e19df21282703 /src/tls | |
parent | 1581b38b6732e19a2f8fcfc049fdbdcc5183b10e (diff) | |
download | external_wpa_supplicant_8_ti-1e5839e06fbc20945044239984b652da9c3fc772.zip external_wpa_supplicant_8_ti-1e5839e06fbc20945044239984b652da9c3fc772.tar.gz external_wpa_supplicant_8_ti-1e5839e06fbc20945044239984b652da9c3fc772.tar.bz2 |
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.
Diffstat (limited to 'src/tls')
-rw-r--r-- | src/tls/tlsv1_server.c | 6 | ||||
-rw-r--r-- | src/tls/tlsv1_server_read.c | 6 | ||||
-rw-r--r-- | src/tls/tlsv1_server_write.c | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/tls/tlsv1_server.c b/src/tls/tlsv1_server.c index c204a47..093c874 100644 --- a/src/tls/tlsv1_server.c +++ b/src/tls/tlsv1_server.c @@ -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 */ } diff --git a/src/tls/tlsv1_server_read.c b/src/tls/tlsv1_server_read.c index 0e299d8..102e8b2 100644 --- a/src/tls/tlsv1_server_read.c +++ b/src/tls/tlsv1_server_read.c @@ -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 */ } diff --git a/src/tls/tlsv1_server_write.c b/src/tls/tlsv1_server_write.c index cf54f42..7386150 100644 --- a/src/tls/tlsv1_server_write.c +++ b/src/tls/tlsv1_server_write.c @@ -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 */ } |