denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added option to disable identity requests completely (old behavior)

Browse Source
This commit is contained in:
Martin Willi
2009-11-12 10:34:01 +01:00
parent 0107f5b687
commit eb7bf91e12
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/eap_sim/eap_sim_peer.c
+1 -1
View File
@@ -246,7 +246,7 @@ static status_t process_start(private_eap_sim_peer_t *this,
simaka_message_t *message; simaka_message_t *message;
enumerator_t *enumerator; enumerator_t *enumerator;
simaka_attribute_t type; simaka_attribute_t type;
chunk_t data, id; chunk_t data, id = chunk_empty;
rng_t *rng; rng_t *rng;
bool supported = FALSE; bool supported = FALSE;
simaka_attribute_t id_req = 0; simaka_attribute_t id_req = 0;
src/charon/plugins/eap_sim/eap_sim_server.c
+16 -12
View File
@@ -450,6 +450,7 @@ static status_t process_start(private_eap_sim_server_t *this,
this->permanent->destroy(this->permanent); this->permanent->destroy(this->permanent);
this->permanent = permanent; this->permanent = permanent;
this->pseudonym = id->clone(id); this->pseudonym = id->clone(id);
/* we already have a new permanent identity now */
this->use_permanent = FALSE; this->use_permanent = FALSE;
} }
} }
@@ -482,7 +483,7 @@ static status_t process_start(private_eap_sim_server_t *this,
{ {
/* probably received a pseudonym we couldn't map */ /* probably received a pseudonym we couldn't map */
DBG1(DBG_IKE, "failed to map pseudonym identity '%Y', " DBG1(DBG_IKE, "failed to map pseudonym identity '%Y', "
"fallback to fullauth identity request", this->permanent); "fallback to permanent identity request", this->permanent);
this->use_pseudonym = FALSE; this->use_pseudonym = FALSE;
DESTROY_IF(this->pseudonym); DESTROY_IF(this->pseudonym);
this->pseudonym = NULL; this->pseudonym = NULL;
@@ -513,17 +514,22 @@ static status_t process_start(private_eap_sim_server_t *this,
message = simaka_message_create(TRUE, this->identifier++, EAP_SIM, message = simaka_message_create(TRUE, this->identifier++, EAP_SIM,
SIM_CHALLENGE, this->crypto); SIM_CHALLENGE, this->crypto);
message->add_attribute(message, AT_RAND, rands); message->add_attribute(message, AT_RAND, rands);
if (this->use_reauth && (id = gen_reauth(this, mk.ptr))) id = gen_reauth(this, mk.ptr);
if (id)
{ {
message->add_attribute(message, AT_NEXT_REAUTH_ID, message->add_attribute(message, AT_NEXT_REAUTH_ID,
id->get_encoding(id)); id->get_encoding(id));
id->destroy(id); id->destroy(id);
} }
else if (this->use_pseudonym && (id = gen_pseudonym(this))) else
{ {
message->add_attribute(message, AT_NEXT_PSEUDONYM, id = gen_pseudonym(this);
id->get_encoding(id)); if (id)
id->destroy(id); {
message->add_attribute(message, AT_NEXT_PSEUDONYM,
id->get_encoding(id));
id->destroy(id);
}
} }
*out = message->generate(message, nonce); *out = message->generate(message, nonce);
message->destroy(message); message->destroy(message);
@@ -717,12 +723,10 @@ eap_sim_server_t *eap_sim_server_create(identification_t *server,
this->msk = chunk_empty; this->msk = chunk_empty;
this->counter = chunk_empty; this->counter = chunk_empty;
this->pending = 0; this->pending = 0;
this->use_reauth = lib->settings->get_bool(lib->settings, this->use_reauth = this->use_pseudonym = this->use_permanent =
"charon.plugins.eap-sim.use_reauth", TRUE); lib->settings->get_bool(lib->settings,
this->use_pseudonym = lib->settings->get_bool(lib->settings, "charon.plugins.eap-sim.request_identity", TRUE);
"charon.plugins.eap-sim.use_pseudonym", TRUE);
this->use_permanent = lib->settings->get_bool(lib->settings,
"charon.plugins.eap-sim.use_permanent", TRUE);
/* generate a non-zero identifier */ /* generate a non-zero identifier */
do { do {
this->identifier = random(); this->identifier = random();