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

Check rng return value when generating COOKIE2 during MOBIKE

Browse Source
This commit is contained in:
Tobias Brunner
2012-07-16 14:53:35 +02:00
committed by Martin Willi
parent 0c096e9bb5
commit 504918348d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/ike_mobike.c
+11 -6
View File
@@ -227,18 +227,20 @@ static void build_address_list(private_ike_mobike_t *this, message_t *message)
/** /**
* build a cookie and add it to the message * build a cookie and add it to the message
*/ */
static void build_cookie(private_ike_mobike_t *this, message_t *message) static bool build_cookie(private_ike_mobike_t *this, message_t *message)
{ {
rng_t *rng; rng_t *rng;
chunk_free(&this->cookie2); chunk_free(&this->cookie2);
rng = lib->crypto->create_rng(lib->crypto, RNG_STRONG); rng = lib->crypto->create_rng(lib->crypto, RNG_STRONG);
if (rng) if (!rng || !rng->allocate_bytes(rng, COOKIE2_SIZE, &this->cookie2))
{ {
rng->allocate_bytes(rng, COOKIE2_SIZE, &this->cookie2); DESTROY_IF(rng);
rng->destroy(rng); return FALSE;
message->add_notify(message, FALSE, COOKIE2, this->cookie2);
} }
message->add_notify(message, FALSE, COOKIE2, this->cookie2);
rng->destroy(rng);
return TRUE;
} }
/** /**
@@ -358,7 +360,10 @@ METHOD(task_t, build_i, status_t,
{ {
message->add_notify(message, FALSE, UPDATE_SA_ADDRESSES, message->add_notify(message, FALSE, UPDATE_SA_ADDRESSES,
chunk_empty); chunk_empty);
build_cookie(this, message); if (!build_cookie(this, message))
{
return FAILED;
}
update_children(this); update_children(this);
} }
if (this->address && !this->check) if (this->address && !this->check)