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

ERP: Add TV/TLV parser 

This is needed for ERP implementation on both the server/authenticator
and peer side.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-11-29 21:28:24 +02:00
parent 0087061de7
commit e2ee327b19
2 changed files with 95 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/eap_common/eap_common.c
View File

@ -1,6 +1,6 @@
/*
* EAP common peer/server definitions
* Copyright (c) 2004-2012, Jouni Malinen <j@w1.fi>
* Copyright (c) 2004-2014, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@ -203,3 +203,86 @@ EapType eap_get_type(const struct wpabuf *msg)
return ((const u8 *) wpabuf_head(msg))[sizeof(struct eap_hdr)];
}
#ifdef CONFIG_ERP
int erp_parse_tlvs(const u8 *pos, const u8 *end, struct erp_tlvs *tlvs,
int stop_at_keyname)
{
os_memset(tlvs, 0, sizeof(*tlvs));
while (pos < end) {
u8 tlv_type, tlv_len;
tlv_type = *pos++;
switch (tlv_type) {
case EAP_ERP_TV_RRK_LIFETIME:
case EAP_ERP_TV_RMSK_LIFETIME:
/* 4-octet TV */
if (pos + 4 > end) {
wpa_printf(MSG_DEBUG, "EAP: Too short TV");
return -1;
}
pos += 4;
break;
case EAP_ERP_TLV_DOMAIN_NAME:
case EAP_ERP_TLV_KEYNAME_NAI:
case EAP_ERP_TLV_CRYPTOSUITES:
case EAP_ERP_TLV_AUTHORIZATION_INDICATION:
case EAP_ERP_TLV_CALLED_STATION_ID:
case EAP_ERP_TLV_CALLING_STATION_ID:
case EAP_ERP_TLV_NAS_IDENTIFIER:
case EAP_ERP_TLV_NAS_IP_ADDRESS:
case EAP_ERP_TLV_NAS_IPV6_ADDRESS:
if (pos >= end) {
wpa_printf(MSG_DEBUG, "EAP: Too short TLV");
return -1;
}
tlv_len = *pos++;
if (tlv_len > (unsigned) (end - pos)) {
wpa_printf(MSG_DEBUG, "EAP: Truncated TLV");
return -1;
}
if (tlv_type == EAP_ERP_TLV_KEYNAME_NAI) {
if (tlvs->keyname) {
wpa_printf(MSG_DEBUG,
"EAP: More than one keyName-NAI");
return -1;
}
tlvs->keyname = pos;
tlvs->keyname_len = tlv_len;
if (stop_at_keyname)
return 0;
} else if (tlv_type == EAP_ERP_TLV_DOMAIN_NAME) {
tlvs->domain = pos;
tlvs->domain_len = tlv_len;
}
pos += tlv_len;
break;
default:
if (tlv_type >= 128 && tlv_type <= 191) {
/* Undefined TLV */
if (pos >= end) {
wpa_printf(MSG_DEBUG,
"EAP: Too short TLV");
return -1;
}
tlv_len = *pos++;
if (tlv_len > (unsigned) (end - pos)) {
wpa_printf(MSG_DEBUG,
"EAP: Truncated TLV");
return -1;
}
pos += tlv_len;
break;
}
wpa_printf(MSG_DEBUG, "EAP: Unknown TV/TLV type %u",
tlv_type);
pos = end;
break;
}
}
return 0;
}
#endif /* CONFIG_ERP */

12
src/eap_common/eap_common.h
View File

@ -1,6 +1,6 @@
/*
* EAP common peer/server definitions
* Copyright (c) 2004-2012, Jouni Malinen <j@w1.fi>
* Copyright (c) 2004-2014, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@ -11,6 +11,14 @@
#include "wpabuf.h"
struct erp_tlvs {
const u8 *keyname;
const u8 *domain;
u8 keyname_len;
u8 domain_len;
};
int eap_hdr_len_valid(const struct wpabuf *msg, size_t min_payload);
const u8 * eap_hdr_validate(int vendor, EapType eap_type,
const struct wpabuf *msg, size_t *plen);
@ -19,5 +27,7 @@ struct wpabuf * eap_msg_alloc(int vendor, EapType type, size_t payload_len,
void eap_update_len(struct wpabuf *msg);
u8 eap_get_id(const struct wpabuf *msg);
EapType eap_get_type(const struct wpabuf *msg);
int erp_parse_tlvs(const u8 *pos, const u8 *end, struct erp_tlvs *tlvs,
int stop_at_keyname);
#endif /* EAP_COMMON_H */