Use nonce_gen instead of rng to generate nonces

Replace usage of rng plugin with nonce generator to create nonces in
IKE_INIT, CHILD_CREATE and QUICK_MODE tasks and the IKEv1 phase 1 helper.
This commit is contained in:
Adrian-Ken Rueegsegger
2012-05-18 08:15:41 +02:00
committed by Tobias Brunner
parent 5338fe5e79
commit afaf1bdf5e
4 changed files with 34 additions and 34 deletions
+6 -6
View File
@@ -297,16 +297,16 @@ static bool add_nonce(private_quick_mode_t *this, chunk_t *nonce,
message_t *message)
{
nonce_payload_t *nonce_payload;
rng_t *rng;
nonce_gen_t *nonceg;
rng = lib->crypto->create_rng(lib->crypto, RNG_WEAK);
if (!rng)
nonceg = this->keymat->keymat.create_nonce_gen(&this->keymat->keymat);
if (!nonceg)
{
DBG1(DBG_IKE, "no RNG found to create nonce");
DBG1(DBG_IKE, "no nonce generator found to create nonce");
return FALSE;
}
rng->allocate_bytes(rng, NONCE_SIZE, nonce);
rng->destroy(rng);
nonceg->allocate_nonce(nonceg, NONCE_SIZE, nonce);
nonceg->destroy(nonceg);
nonce_payload = nonce_payload_create(NONCE_V1);
nonce_payload->set_nonce(nonce_payload, *nonce);