Send AT_NEXT_PSEUDONYM also if an AT_NEXT_REAUTH_ID is already added.

diff --git a/src/libcharon/plugins/eap_aka/eap_aka_server.c b/src/libcharon/plugins/eap_aka/eap_aka_server.c
index 3dc9c9c9f7020e87aea143b654065b4a30f3e46d..d8e85ceef88e5eba1dc9f78864ef3890a8138637 100644 (file)
--- 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 a6704a7be568c18fef4d5f0283937df127fa4325..e0f7e92adc68ea97a490d418e98c16a4def43955 100644 (file)
--- 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);