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

Check rng return value when generating IKEv1 message IDs

Browse Source
This commit is contained in:
Tobias Brunner
2012-07-16 14:53:35 +02:00
committed by Martin Willi
parent 504918348d
commit 1bb9c51e87
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+20 -8
View File
@@ -501,12 +501,17 @@ METHOD(task_manager_t, initiate, status_t,
me = this->ike_sa->get_my_host(this->ike_sa);
other = this->ike_sa->get_other_host(this->ike_sa);
message = message_create(IKEV1_MAJOR_VERSION, IKEV1_MINOR_VERSION);
if (new_mid)
{
this->rng->get_bytes(this->rng, sizeof(this->initiating.mid),
(void*)&this->initiating.mid);
if (!this->rng->get_bytes(this->rng, sizeof(this->initiating.mid),
(void*)&this->initiating.mid))
{
DBG1(DBG_IKE, "failed to allocate message ID, destroying IKE_SA");
flush(this);
return DESTROY_ME;
}
}
message = message_create(IKEV1_MAJOR_VERSION, IKEV1_MINOR_VERSION);
message->set_message_id(message, this->initiating.mid);
message->set_source(message, me->clone(me));
message->set_destination(message, other->clone(other));
@@ -721,11 +726,14 @@ static void send_notify(private_task_manager_t *this, message_t *request,
DBG1(DBG_IKE, "ignore malformed INFORMATIONAL request");
return;
}
if (!this->rng->get_bytes(this->rng, sizeof(mid), (void*)&mid))
{
DBG1(DBG_IKE, "failed to allocate message ID");
return;
}
response = message_create(IKEV1_MAJOR_VERSION, IKEV1_MINOR_VERSION);
response->set_exchange_type(response, INFORMATIONAL_V1);
response->set_request(response, TRUE);
this->rng->get_bytes(this->rng, sizeof(mid), (void*)&mid);
response->set_message_id(response, mid);
response->add_payload(response, (payload_t*)
notify_payload_create_from_protocol_and_type(NOTIFY_V1,
@@ -1678,9 +1686,13 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
destroy(this);
return NULL;
}
this->rng->get_bytes(this->rng, sizeof(this->dpd_send),
(void*)&this->dpd_send);
if (!this->rng->get_bytes(this->rng, sizeof(this->dpd_send),
(void*)&this->dpd_send))
{
DBG1(DBG_IKE, "failed to allocate message ID, unable to create IKE_SA");
destroy(this);
return NULL;
}
this->dpd_send &= 0x7FFFFFFF;
return &this->public;