jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed extra '_' from struct eap_tlv_crypto_binding__tlv name

Browse source
This commit is contained in:
Jouni Malinen 2008-02-27 17:58:13 -08:00
parent cdd1bc9288
commit ed5a02fd94
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eap_common/eap_fast_common.c
View file

@ -262,7 +262,7 @@ int eap_fast_parse_tlv(struct eap_fast_tlv_parse *tlv,
tlv->iresult = EAP_TLV_RESULT_FAILURE; tlv->iresult = EAP_TLV_RESULT_FAILURE;
return -2; return -2;
} }
tlv->crypto_binding = (struct eap_tlv_crypto_binding__tlv *) tlv->crypto_binding = (struct eap_tlv_crypto_binding_tlv *)
(pos - sizeof(struct eap_tlv_hdr)); (pos - sizeof(struct eap_tlv_hdr));
break; break;
case EAP_TLV_REQUEST_ACTION_TLV: case EAP_TLV_REQUEST_ACTION_TLV:

2
src/eap_common/eap_fast_common.h
View file

@ -89,7 +89,7 @@ struct tls_connection;
struct eap_fast_tlv_parse { struct eap_fast_tlv_parse {
u8 *eap_payload_tlv; u8 *eap_payload_tlv;
size_t eap_payload_tlv_len; size_t eap_payload_tlv_len;
struct eap_tlv_crypto_binding__tlv *crypto_binding; struct eap_tlv_crypto_binding_tlv *crypto_binding;
size_t crypto_binding_len; size_t crypto_binding_len;
int iresult; int iresult;
int result; int result;

2
src/eap_common/eap_tlv_common.h
View file

@ -73,7 +73,7 @@ struct eap_tlv_intermediate_result_tlv {
} STRUCT_PACKED; } STRUCT_PACKED;
/* RFC 4851, Section 4.2.8 - Crypto-Binding TLV */ /* RFC 4851, Section 4.2.8 - Crypto-Binding TLV */
struct eap_tlv_crypto_binding__tlv { struct eap_tlv_crypto_binding_tlv {
be16 tlv_type; be16 tlv_type;
be16 length; be16 length;
u8 reserved; u8 reserved;

14
src/eap_peer/eap_fast.c
View file

@ -558,7 +558,7 @@ static struct wpabuf * eap_fast_process_eap_payload_tlv(
static int eap_fast_validate_crypto_binding( static int eap_fast_validate_crypto_binding(
struct eap_tlv_crypto_binding__tlv *_bind) struct eap_tlv_crypto_binding_tlv *_bind)
{ {
wpa_printf(MSG_DEBUG, "EAP-FAST: Crypto-Binding TLV: Version %d " wpa_printf(MSG_DEBUG, "EAP-FAST: Crypto-Binding TLV: Version %d "
"Received Version %d SubType %d", "Received Version %d SubType %d",
@ -584,8 +584,8 @@ static int eap_fast_validate_crypto_binding(
static void eap_fast_write_crypto_binding( static void eap_fast_write_crypto_binding(
struct eap_tlv_crypto_binding__tlv *rbind, struct eap_tlv_crypto_binding_tlv *rbind,
struct eap_tlv_crypto_binding__tlv *_bind, const u8 *cmk) struct eap_tlv_crypto_binding_tlv *_bind, const u8 *cmk)
{ {
rbind->tlv_type = host_to_be16(EAP_TLV_TYPE_MANDATORY | rbind->tlv_type = host_to_be16(EAP_TLV_TYPE_MANDATORY |
EAP_TLV_CRYPTO_BINDING_TLV); EAP_TLV_CRYPTO_BINDING_TLV);
@ -704,7 +704,7 @@ static u8 * eap_fast_write_pac_request(u8 *pos, u16 pac_type)
static struct wpabuf * eap_fast_process_crypto_binding( static struct wpabuf * eap_fast_process_crypto_binding(
struct eap_sm *sm, struct eap_fast_data *data, struct eap_sm *sm, struct eap_fast_data *data,
struct eap_method_ret *ret, struct eap_method_ret *ret,
struct eap_tlv_crypto_binding__tlv *_bind, size_t bind_len, int final) struct eap_tlv_crypto_binding_tlv *_bind, size_t bind_len, int final)
{ {
struct wpabuf *resp; struct wpabuf *resp;
u8 *pos; u8 *pos;
@ -752,7 +752,7 @@ static struct wpabuf * eap_fast_process_crypto_binding(
req_tunnel_pac = 1; req_tunnel_pac = 1;
} }
len = sizeof(*rresult) + sizeof(struct eap_tlv_crypto_binding__tlv); len = sizeof(*rresult) + sizeof(struct eap_tlv_crypto_binding_tlv);
if (req_tunnel_pac) if (req_tunnel_pac)
len += sizeof(struct eap_tlv_hdr) + len += sizeof(struct eap_tlv_hdr) +
sizeof(struct eap_tlv_request_action_tlv) + sizeof(struct eap_tlv_request_action_tlv) +
@ -781,8 +781,8 @@ static struct wpabuf * eap_fast_process_crypto_binding(
data->phase2_success = 0; data->phase2_success = 0;
} }
pos = wpabuf_put(resp, sizeof(struct eap_tlv_crypto_binding__tlv)); pos = wpabuf_put(resp, sizeof(struct eap_tlv_crypto_binding_tlv));
eap_fast_write_crypto_binding((struct eap_tlv_crypto_binding__tlv *) eap_fast_write_crypto_binding((struct eap_tlv_crypto_binding_tlv *)
pos, _bind, cmk); pos, _bind, cmk);
if (req_tunnel_pac) { if (req_tunnel_pac) {

4
src/eap_server/eap_fast.c
View file

@ -612,7 +612,7 @@ static struct wpabuf * eap_fast_build_crypto_binding(
{ {
struct wpabuf *buf; struct wpabuf *buf;
struct eap_tlv_result_tlv *result; struct eap_tlv_result_tlv *result;
struct eap_tlv_crypto_binding__tlv *binding; struct eap_tlv_crypto_binding_tlv *binding;
int type; int type;
buf = wpabuf_alloc(sizeof(*result) + sizeof(*binding)); buf = wpabuf_alloc(sizeof(*result) + sizeof(*binding));
@ -1079,7 +1079,7 @@ static int eap_fast_parse_tlvs(u8 *data, size_t data_len,
static int eap_fast_validate_crypto_binding( static int eap_fast_validate_crypto_binding(
struct eap_fast_data *data, struct eap_tlv_crypto_binding__tlv *b, struct eap_fast_data *data, struct eap_tlv_crypto_binding_tlv *b,
size_t bind_len) size_t bind_len)
{ {
u8 cmac[20]; u8 cmac[20];