ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Nonce: Let get_nonce, allocate_nonce return boolean

This commit is contained in:
Reto Buerki 2012-06-12 10:54:02 +02:00 committed by Martin Willi
parent f3ca96b2bf
commit 605985d122
6 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libcharon/sa/ikev1/phase1.c
View File

@ -651,7 +651,12 @@ METHOD(phase1_t, add_nonce_ke, bool,
DBG1(DBG_IKE, "no nonce generator found to create nonce");
return FALSE;
}
nonceg->allocate_nonce(nonceg, NONCE_SIZE, &nonce);
if (!nonceg->allocate_nonce(nonceg, NONCE_SIZE, &nonce))
{
DBG1(DBG_IKE, "nonce allocation failed");
nonceg->destroy(nonceg);
return FALSE;
}
nonceg->destroy(nonceg);
nonce_payload = nonce_payload_create(NONCE_V1);

7
src/libcharon/sa/ikev1/tasks/quick_mode.c
View File

@ -328,7 +328,12 @@ static bool add_nonce(private_quick_mode_t *this, chunk_t *nonce,
DBG1(DBG_IKE, "no nonce generator found to create nonce");
return FALSE;
}
nonceg->allocate_nonce(nonceg, NONCE_SIZE, nonce);
if (!nonceg->allocate_nonce(nonceg, NONCE_SIZE, nonce))
{
DBG1(DBG_IKE, "nonce allocation failed");
nonceg->destroy(nonceg);
return FALSE;
}
nonceg->destroy(nonceg);
nonce_payload = nonce_payload_create(NONCE_V1);

8
src/libcharon/sa/ikev2/tasks/child_create.c
View File

@ -207,8 +207,14 @@ static status_t generate_nonce(private_child_create_t *this)
DBG1(DBG_IKE, "no nonce generator found to create nonce");
return FAILED;
}
nonceg->allocate_nonce(nonceg, NONCE_SIZE, &this->my_nonce);
if (!nonceg->allocate_nonce(nonceg, NONCE_SIZE, &this->my_nonce))
{
DBG1(DBG_IKE, "nonce allocation failed");
nonceg->destroy(nonceg);
return FAILED;
}
nonceg->destroy(nonceg);
return SUCCESS;
}

14
src/libcharon/sa/ikev2/tasks/ike_init.c
View File

@ -263,7 +263,12 @@ METHOD(task_t, build_i, status_t,
DBG1(DBG_IKE, "no nonce generator found to create nonce");
return FAILED;
}
nonceg->allocate_nonce(nonceg, NONCE_SIZE, &this->my_nonce);
if (!nonceg->allocate_nonce(nonceg, NONCE_SIZE, &this->my_nonce))
{
DBG1(DBG_IKE, "nonce allocation failed");
nonceg->destroy(nonceg);
return FAILED;
}
nonceg->destroy(nonceg);
}
@ -302,7 +307,12 @@ METHOD(task_t, process_r, status_t,
DBG1(DBG_IKE, "no nonce generator found to create nonce");
return FAILED;
}
nonceg->allocate_nonce(nonceg, NONCE_SIZE, &this->my_nonce);
if (!nonceg->allocate_nonce(nonceg, NONCE_SIZE, &this->my_nonce))
{
DBG1(DBG_IKE, "nonce allocation failed");
nonceg->destroy(nonceg);
return FAILED;
}
nonceg->destroy(nonceg);
#ifdef ME

6
src/libstrongswan/crypto/nonce_gen.h
View File

@ -35,16 +35,18 @@ struct nonce_gen_t {
*
* @param size size of nonce in bytes
* @param buffer pointer where the generated nonce will be written
* @return TRUE if nonce allocation was succesful, FALSE otherwise
*/
void (*get_nonce) (nonce_gen_t *this, size_t size, u_int8_t *buffer);
bool (*get_nonce) (nonce_gen_t *this, size_t size, u_int8_t *buffer);
/**
* Generates a nonce and allocates space for it.
*
* @param size size of nonce in bytes
* @param chunk chunk which will hold the generated nonce
* @return TRUE if nonce allocation was succesful, FALSE otherwise
*/
void (*allocate_nonce) (nonce_gen_t *this, size_t size, chunk_t *chunk);
bool (*allocate_nonce) (nonce_gen_t *this, size_t size, chunk_t *chunk);
/**
* Destroys a nonce generator object.

6
src/libstrongswan/plugins/nonce/nonce_nonceg.c
View File

@ -35,16 +35,18 @@ struct private_nonce_nonceg_t {
rng_t* rng;
};
METHOD(nonce_gen_t, get_nonce, void,
METHOD(nonce_gen_t, get_nonce, bool,
private_nonce_nonceg_t *this, size_t size, u_int8_t *buffer)
{
this->rng->get_bytes(this->rng, size, buffer);
return TRUE;
}
METHOD(nonce_gen_t, allocate_nonce, void,
METHOD(nonce_gen_t, allocate_nonce, bool,
private_nonce_nonceg_t *this, size_t size, chunk_t *chunk)
{
this->rng->allocate_bytes(this->rng, size, chunk);
return TRUE;
}
METHOD(nonce_gen_t, destroy, void,