From b04e72c21c08caae6cbb0e2b68545461aaf36db6 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 27 Nov 2009 15:40:40 +0100 Subject: [PATCH] SIM/AKA/Request/Reauthentication AT_MAC does not include NONCE_S, only the response --- src/charon/plugins/eap_aka/eap_aka_peer.c | 2 +- src/charon/plugins/eap_aka/eap_aka_server.c | 3 +-- src/charon/plugins/eap_sim/eap_sim_peer.c | 2 +- src/charon/plugins/eap_sim/eap_sim_server.c | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/charon/plugins/eap_aka/eap_aka_peer.c b/src/charon/plugins/eap_aka/eap_aka_peer.c index 080c09d28..d1ab554a1 100644 --- a/src/charon/plugins/eap_aka/eap_aka_peer.c +++ b/src/charon/plugins/eap_aka/eap_aka_peer.c @@ -366,7 +366,7 @@ static status_t process_reauthentication(private_eap_aka_peer_t *this, *out = create_client_error(this, in->get_identifier(in)); return NEED_MORE; } - if (!in->verify(in, nonce)) + if (!in->verify(in, chunk_empty)) { *out = create_client_error(this, in->get_identifier(in)); return NEED_MORE; diff --git a/src/charon/plugins/eap_aka/eap_aka_server.c b/src/charon/plugins/eap_aka/eap_aka_server.c index 6cb971221..acf5c632a 100644 --- a/src/charon/plugins/eap_aka/eap_aka_server.c +++ b/src/charon/plugins/eap_aka/eap_aka_server.c @@ -244,8 +244,7 @@ static status_t reauthenticate(private_eap_aka_server_t *this, next->get_encoding(next)); next->destroy(next); } - /* create AT_MAC over EAP-Message|NONCE_S */ - *out = message->generate(message, this->nonce); + *out = message->generate(message, chunk_empty); message->destroy(message); this->pending = SIM_REAUTHENTICATION; diff --git a/src/charon/plugins/eap_sim/eap_sim_peer.c b/src/charon/plugins/eap_sim/eap_sim_peer.c index b5e010dbd..66365b303 100644 --- a/src/charon/plugins/eap_sim/eap_sim_peer.c +++ b/src/charon/plugins/eap_sim/eap_sim_peer.c @@ -429,7 +429,7 @@ static status_t process_reauthentication(private_eap_sim_peer_t *this, SIM_UNABLE_TO_PROCESS); return NEED_MORE; } - if (!in->verify(in, nonce)) + if (!in->verify(in, chunk_empty)) { *out = create_client_error(this, in->get_identifier(in), SIM_UNABLE_TO_PROCESS); diff --git a/src/charon/plugins/eap_sim/eap_sim_server.c b/src/charon/plugins/eap_sim/eap_sim_server.c index aa3f503dc..03b6a19d6 100644 --- a/src/charon/plugins/eap_sim/eap_sim_server.c +++ b/src/charon/plugins/eap_sim/eap_sim_server.c @@ -172,8 +172,7 @@ static status_t reauthenticate(private_eap_sim_server_t *this, next->get_encoding(next)); next->destroy(next); } - /* create AT_MAC over EAP-Message|NONCE_S */ - *out = message->generate(message, this->nonce); + *out = message->generate(message, chunk_empty); message->destroy(message); this->pending = SIM_REAUTHENTICATION;