diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-09-13 11:09:07 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-09-13 11:09:07 +0200 |
| commit | 4b7c63cf529dadc0f47da59cd7a34908352b85e6 (patch) | |
| tree | ed01e7119697689482a1008b3ebb117d856883ea /src | |
| parent | 7213abcbfb6ceca3529431e8ea3eeea3655a075d (diff) | |
| download | strongswan-4b7c63cf529dadc0f47da59cd7a34908352b85e6.tar.bz2 strongswan-4b7c63cf529dadc0f47da59cd7a34908352b85e6.tar.xz | |
Send AT_NEXT_PSEUDONYM also if an AT_NEXT_REAUTH_ID is already added.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/plugins/eap_aka/eap_aka_server.c | 13 | ||||
| -rw-r--r-- | src/libcharon/plugins/eap_sim/eap_sim_server.c | 13 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/libcharon/plugins/eap_aka/eap_aka_server.c b/src/libcharon/plugins/eap_aka/eap_aka_server.c index 3dc9c9c9f..d8e85ceef 100644 --- a/src/libcharon/plugins/eap_aka/eap_aka_server.c +++ b/src/libcharon/plugins/eap_aka/eap_aka_server.c @@ -196,15 +196,12 @@ static status_t challenge(private_eap_aka_server_t *this, eap_payload_t **out) id->get_encoding(id)); id->destroy(id); } - else + id = this->mgr->provider_gen_pseudonym(this->mgr, this->permanent); + if (id) { - id = this->mgr->provider_gen_pseudonym(this->mgr, this->permanent); - if (id) - { - message->add_attribute(message, AT_NEXT_PSEUDONYM, - id->get_encoding(id)); - id->destroy(id); - } + message->add_attribute(message, AT_NEXT_PSEUDONYM, + id->get_encoding(id)); + id->destroy(id); } *out = eap_payload_create_data_own(message->generate(message, chunk_empty)); message->destroy(message); diff --git a/src/libcharon/plugins/eap_sim/eap_sim_server.c b/src/libcharon/plugins/eap_sim/eap_sim_server.c index a6704a7be..e0f7e92ad 100644 --- a/src/libcharon/plugins/eap_sim/eap_sim_server.c +++ b/src/libcharon/plugins/eap_sim/eap_sim_server.c @@ -399,15 +399,12 @@ static status_t process_start(private_eap_sim_server_t *this, id->get_encoding(id)); id->destroy(id); } - else + id = this->mgr->provider_gen_pseudonym(this->mgr, this->permanent); + if (id) { - id = this->mgr->provider_gen_pseudonym(this->mgr, this->permanent); - if (id) - { - message->add_attribute(message, AT_NEXT_PSEUDONYM, - id->get_encoding(id)); - id->destroy(id); - } + message->add_attribute(message, AT_NEXT_PSEUDONYM, + id->get_encoding(id)); + id->destroy(id); } *out = eap_payload_create_data_own(message->generate(message, nonce)); message->destroy(message); |