diff options
| author | Jouni Malinen <j@w1.fi> | 2014-06-20 21:25:40 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2014-06-20 21:26:29 (GMT) |
| commit | 79122f9f9c15c72f5da03677415e7a6d2bfe8d72 (patch) | |
| tree | 4409b146861698f60f9fd6ef425da92159e1d098 /src/eap_peer/eap_sim.c | |
| parent | 32747a3eee0922c2cc7b09845788f6281089bb4a (diff) | |
| download | hostap-79122f9f9c15c72f5da03677415e7a6d2bfe8d72.zip hostap-79122f9f9c15c72f5da03677415e7a6d2bfe8d72.tar.gz hostap-79122f9f9c15c72f5da03677415e7a6d2bfe8d72.tar.bz2 | |
EAP-SIM/AKA: Remove unused RESULT_FAILURE state
This was not set anywhere, so remove the unnecessary code trying to
handle the unused state.
Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/eap_peer/eap_sim.c')
| -rw-r--r-- | src/eap_peer/eap_sim.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/eap_peer/eap_sim.c b/src/eap_peer/eap_sim.c index fc9df96..63c8939 100644 --- a/src/eap_peer/eap_sim.c +++ b/src/eap_peer/eap_sim.c @@ -43,7 +43,7 @@ struct eap_sim_data { u8 *last_eap_identity; size_t last_eap_identity_len; enum { - CONTINUE, RESULT_SUCCESS, RESULT_FAILURE, SUCCESS, FAILURE + CONTINUE, RESULT_SUCCESS, SUCCESS, FAILURE } state; int result_ind, use_result_ind; }; @@ -57,8 +57,6 @@ static const char * eap_sim_state_txt(int state) return "CONTINUE"; case RESULT_SUCCESS: return "RESULT_SUCCESS"; - case RESULT_FAILURE: - return "RESULT_FAILURE"; case SUCCESS: return "SUCCESS"; case FAILURE: @@ -788,7 +786,7 @@ static struct wpabuf * eap_sim_process_challenge(struct eap_sm *sm, if (data->result_ind && attr->result_ind) data->use_result_ind = 1; - if (data->state != FAILURE && data->state != RESULT_FAILURE) { + if (data->state != FAILURE) { eap_sim_state(data, data->use_result_ind ? RESULT_SUCCESS : SUCCESS); } @@ -989,7 +987,7 @@ static struct wpabuf * eap_sim_process_reauthentication( if (data->result_ind && attr->result_ind) data->use_result_ind = 1; - if (data->state != FAILURE && data->state != RESULT_FAILURE) { + if (data->state != FAILURE) { eap_sim_state(data, data->use_result_ind ? RESULT_SUCCESS : SUCCESS); } @@ -1088,9 +1086,7 @@ done: DECISION_UNCOND_SUCC : DECISION_COND_SUCC; ret->methodState = data->use_result_ind ? METHOD_DONE : METHOD_MAY_CONT; - } else if (data->state == RESULT_FAILURE) - ret->methodState = METHOD_CONT; - else if (data->state == RESULT_SUCCESS) + } else if (data->state == RESULT_SUCCESS) ret->methodState = METHOD_CONT; if (ret->methodState == METHOD_DONE) { |