Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-19 03:14:05 -05:00
Code Issues Projects Releases Wiki Activity

EAP-TEAP peer: Add Intermediate-Result TLV with Crypto-Binding TLV

Browse Source 
Previously, only the Result TLV was added when writing Crypto-Binding
TLV response. This is not sufficient, since RFC 7170 require
Intermediate-Result TLV response to be included from the peer if the
server included Intermediate-Result TLV.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-08-16 23:11:28 +03:00
parent a66e53c419
commit 0f7c91f2b9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/eap_peer/eap_teap.c
View File

@ -1193,6 +1193,7 @@ static int eap_teap_process_decrypted(struct eap_sm *sm,
struct eap_teap_tlv_parse tlv; struct eap_teap_tlv_parse tlv;
int failed = 0; int failed = 0;
enum teap_error_codes error = 0; enum teap_error_codes error = 0;
int iresult_added = 0;
if (eap_teap_parse_decrypted(decrypted, &tlv, &resp) < 0) { if (eap_teap_parse_decrypted(decrypted, &tlv, &resp) < 0) {
/* Parsing failed - no response available */ /* Parsing failed - no response available */
@ -1262,6 +1263,7 @@ static int eap_teap_process_decrypted(struct eap_sm *sm,
resp = wpabuf_concat(resp, tmp); resp = wpabuf_concat(resp, tmp);
if (tlv.iresult == TEAP_STATUS_FAILURE) if (tlv.iresult == TEAP_STATUS_FAILURE)
failed = 1; failed = 1;
iresult_added = 1;
} }
} }
@ -1348,6 +1350,13 @@ done:
tmp = eap_teap_tlv_result(TEAP_STATUS_SUCCESS, 0); tmp = eap_teap_tlv_result(TEAP_STATUS_SUCCESS, 0);
resp = wpabuf_concat(tmp, resp); resp = wpabuf_concat(tmp, resp);
} }
if ((tlv.iresult == TEAP_STATUS_SUCCESS ||
tlv.iresult == TEAP_STATUS_FAILURE) && !iresult_added) {
tmp = eap_teap_tlv_result((!failed && data->phase2_success) ?
TEAP_STATUS_SUCCESS :
TEAP_STATUS_FAILURE, 1);
resp = wpabuf_concat(tmp, resp);
}
if (resp && tlv.result == TEAP_STATUS_SUCCESS && !failed && if (resp && tlv.result == TEAP_STATUS_SUCCESS && !failed &&
tlv.crypto_binding && data->phase2_success) { tlv.crypto_binding && data->phase2_success) {